From 81277cca75391602a95392e609043cdf222e0e3f Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 29 Oct 2012 14:27:02 -0700
Subject: [PATCH] Move util::color to css::color

---
 src/servo/{util => css}/color.rs | 6 ------
 src/servo/css/parser.rs          | 2 +-
 src/servo/css/styles.rs          | 4 ++--
 src/servo/css/values.rs          | 2 +-
 src/servo/layout/box.rs          | 6 +++---
 src/servo/servo.rc               | 3 ++-
 src/servo/text/text_run.rs       | 2 +-
 7 files changed, 10 insertions(+), 15 deletions(-)
 rename src/servo/{util => css}/color.rs (97%)

diff --git a/src/servo/util/color.rs b/src/servo/css/color.rs
similarity index 97%
rename from src/servo/util/color.rs
rename to src/servo/css/color.rs
index 10d4f4aa956..37086b062ad 100644
--- a/src/servo/util/color.rs
+++ b/src/servo/css/color.rs
@@ -1,9 +1,3 @@
-/** A library for handling colors and parsing css color declarations. */
-
-// TODO: handle #rrggbb color declarations, handle rgb(r%,g%,b%),
-// sanitize input / crop it to correct ranges, predefine other 130
-// css-defined colors
-
 use float::round;
 use libc::types::os::arch::c95::c_double;
 use css_colors::*;
diff --git a/src/servo/css/parser.rs b/src/servo/css/parser.rs
index a9b3a9ff7a5..52e2be08775 100644
--- a/src/servo/css/parser.rs
+++ b/src/servo/css/parser.rs
@@ -14,7 +14,7 @@ use comm::recv;
 use option::{map, is_none};
 use vec::push;
 use parser_util::*;
-use util::color::parsing::parse_color;
+use color::parsing::parse_color;
 use vec::push;
 
 type TokenReader = {stream : pipes::Port<Token>, mut lookahead : Option<Token>};
diff --git a/src/servo/css/styles.rs b/src/servo/css/styles.rs
index 22660398255..839683b6492 100644
--- a/src/servo/css/styles.rs
+++ b/src/servo/css/styles.rs
@@ -9,8 +9,8 @@ use css::values::Stylesheet;
 use dom::element::{HTMLDivElement, HTMLHeadElement, HTMLImageElement, UnknownElement, HTMLScriptElement};
 use dom::node::{Comment, Doctype, Element, Text,
                 Node, NodeKind, NodeTree, LayoutData};
-use util::color::{Color, rgb};
-use util::color::css_colors::{white, black};
+use color::{Color, rgb};
+use color::css_colors::{white, black};
 use layout::context::LayoutContext;
 
 #[allow(non_implicitly_copyable_typarams)]
diff --git a/src/servo/css/values.rs b/src/servo/css/values.rs
index 1835acf4ae7..025a8e6884d 100644
--- a/src/servo/css/values.rs
+++ b/src/servo/css/values.rs
@@ -4,7 +4,7 @@ stored.  CSS selector-matching rules, as presented by
 http://www.w3.org/TR/CSS2/selector.html are represented by nested types.
 */
 
-use SharedColor = util::color::Color;
+use SharedColor = color::Color;
 use cmp::Eq;
 use std::net::url::Url;
 
diff --git a/src/servo/layout/box.rs b/src/servo/layout/box.rs
index 85a4b2c4abf..56612510f2c 100644
--- a/src/servo/layout/box.rs
+++ b/src/servo/layout/box.rs
@@ -1,6 +1,6 @@
 /* Fundamental layout structures and algorithms. */
 
-use servo_util::color::rgb;
+use css::color::rgb;
 use arc = std::arc;
 use arc::ARC;
 use au = gfx::geometry;
@@ -11,6 +11,7 @@ use core::rand;
 use css::styles::SpecifiedStyle;
 use css::values::{BoxSizing, Length, Px, CSSDisplay, Specified, BgColor, BgColorTransparent};
 use css::values::{BdrColor, PosAbsolute};
+use css::color::{Color, rgba};
 use dom::element::{ElementKind, HTMLDivElement, HTMLImageElement};
 use dom::node::{Element, Node, NodeData, NodeKind, NodeTree};
 use geom::rect::Rect;
@@ -26,7 +27,6 @@ use servo_text::text_run;
 use servo_text::text_run::TextRun;
 use std::net::url::Url;
 use task::spawn;
-use util::color::Color;
 use util::range::*;
 use util::tree;
 
@@ -447,7 +447,7 @@ impl RenderBox : RenderBoxMethods {
         let boxed_bgcolor = self.d().node.style().background_color;
         let bgcolor = match boxed_bgcolor {
             Specified(BgColor(c)) => c,
-            Specified(BgColorTransparent) | _ => util::color::rgba(0,0,0,0.0)
+            Specified(BgColorTransparent) | _ => rgba(0,0,0,0.0)
         };
         if !bgcolor.alpha.fuzzy_eq(&0.0) {
             list.append_item(~DisplayItem::new_SolidColor(abs_bounds, bgcolor.red, bgcolor.green, bgcolor.blue));
diff --git a/src/servo/servo.rc b/src/servo/servo.rc
index ca097bb0226..4cd71ccfd14 100755
--- a/src/servo/servo.rc
+++ b/src/servo/servo.rc
@@ -55,6 +55,8 @@ pub mod css {
         pub mod apply;
         pub mod matching;
     }
+
+    pub mod color;
 }
 
 pub mod layout {
@@ -136,7 +138,6 @@ pub mod resource {
 
 pub mod util {
     pub mod tree;
-    pub mod color;
     pub mod time;
     pub mod url;
     pub mod vec;
diff --git a/src/servo/text/text_run.rs b/src/servo/text/text_run.rs
index a64501fad97..9b41c800350 100644
--- a/src/servo/text/text_run.rs
+++ b/src/servo/text/text_run.rs
@@ -9,7 +9,7 @@ use gfx::geometry::Au;
 use glyph::GlyphStore;
 use layout::context::LayoutContext;
 use libc::{c_void};
-use servo_util::color;
+use css::color;
 use std::arc;
 use servo_util::range::{Range, MutableRange};