From dc882b8ecfc698baa7da42d57cd6c39a639a72c0 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Mon, 14 Oct 2013 18:17:44 +0100
Subject: [PATCH] Move the content of 'script/style' into the new 'style'
 crate.

---
 Makefile.in                                   |  17 +++++++-------
 src/components/script/script.rc               |   5 -----
 src/components/script/style/mod.rs            |  20 -----------------
 src/components/{script => }/style/README.md   |   0
 src/components/{script => }/style/errors.rs   |   0
 .../{script => }/style/media_queries.rs       |   6 ++---
 .../{script => }/style/namespaces.rs          |   2 +-
 .../{script => }/style/parsing_utils.rs       |   0
 .../{script => }/style/properties/.gitignore  |   0
 .../style/properties/Mako-0.8.1.zip           | Bin
 .../style/properties/common_types.rs          |   0
 .../{script => }/style/properties/mod.rs.mako |   4 ++--
 .../{script => }/style/selector_matching.rs   |  12 +++++-----
 .../{script => }/style/selectors.rs           |   2 +-
 src/components/style/style.rc                 |  21 ++++++++++++++++++
 .../{script => }/style/stylesheets.rs         |  12 +++++-----
 .../style/tests/bootstrap-v3.0.0.css          |   0
 .../{script => }/style/tests/mod.rs           |   0
 18 files changed, 49 insertions(+), 52 deletions(-)
 delete mode 100644 src/components/script/style/mod.rs
 rename src/components/{script => }/style/README.md (100%)
 rename src/components/{script => }/style/errors.rs (100%)
 rename src/components/{script => }/style/media_queries.rs (94%)
 rename src/components/{script => }/style/namespaces.rs (98%)
 rename src/components/{script => }/style/parsing_utils.rs (100%)
 rename src/components/{script => }/style/properties/.gitignore (100%)
 rename src/components/{script => }/style/properties/Mako-0.8.1.zip (100%)
 rename src/components/{script => }/style/properties/common_types.rs (100%)
 rename src/components/{script => }/style/properties/mod.rs.mako (99%)
 rename src/components/{script => }/style/selector_matching.rs (97%)
 rename src/components/{script => }/style/selectors.rs (99%)
 rename src/components/{script => }/style/stylesheets.rs (95%)
 rename src/components/{script => }/style/tests/bootstrap-v3.0.0.css (100%)
 rename src/components/{script => }/style/tests/mod.rs (100%)

diff --git a/Makefile.in b/Makefile.in
index 31edcf0f818..e1ea931488b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -229,21 +229,22 @@ DEPS_gfx = $(CRATE_gfx) $(SRC_gfx) $(DONE_SUBMODULES) $(DONE_util) $(DONE_net) $
 RFLAGS_script = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/util -L $(B)src/components/net -L $(B)src/components/gfx -L $(B)src/components/msg
 WEBIDL_script = $(call rwildcard,$(S)src/components/script/,*.webidl)
 AUTOGEN_SRC_script = $(patsubst %.webidl, %Binding.rs, $(WEBIDL_script))
-MAKO_ZIP = $(S)src/components/script/style/properties/Mako-0.8.1.zip
-MAKO_script = $(S)src/components/script/style/properties/mod.rs
-MAKO_SRC_script = $(MAKO_script).mako
-SRC_script = $(call rwildcard,$(S)src/components/script/,*.rs) $(AUTOGEN_SRC_script) $(MAKO_script)
+SRC_script = $(call rwildcard,$(S)src/components/script/,*.rs) $(AUTOGEN_SRC_script)
 CRATE_script = $(S)src/components/script/script.rc
 DONE_script = $(B)src/components/script/libscript.dummy
 
 DEPS_script = $(CRATE_script) $(SRC_script) $(DONE_SUBMODULES) $(DONE_util) $(DONE_net) $(DONE_gfx) $(DONE_msg)
 
-RFLAGS_style = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/util
-SRC_style = $(call rwildcard,$(S)src/components/style/,*.rs)
+RFLAGS_style = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/util -L $(B)src/components/script -L $(B)src/components/gfx -L $(B)src/components/net -L $(B)src/components/msg
+MAKO_ZIP = $(S)src/components/style/properties/Mako-0.8.1.zip
+MAKO_style = $(S)src/components/style/properties/mod.rs
+MAKO_SRC_style = $(MAKO_style).mako
+SRC_style = $(call rwildcard,$(S)src/components/style/,*.rs) $(MAKO_style)
 CRATE_style = $(S)src/components/style/style.rc
 DONE_style = $(B)src/components/style/libstyle.dummy
 
-DEPS_style = $(CRATE_style) $(SRC_style) $(DONE_SUBMODULES) $(DONE_util)
+# TODO: reverse the dependency with script
+DEPS_style = $(CRATE_style) $(SRC_style) $(DONE_SUBMODULES) $(DONE_util) $(DONE_script)
 
 RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/gfx -L $(B)src/components/util -L $(B)src/components/net -L $(B)src/components/script -L $(B)src/components/style -L $(B)src/components/msg
 
@@ -292,7 +293,7 @@ $(AUTOGEN_SRC_script): %Binding.rs: $(bindinggen_dependencies) \
 
 globalgen_dependencies := $(addprefix $(BINDINGS_SRC)/, GlobalGen.py Bindings.conf Configuration.py CodegenRust.py parser/WebIDL.py) $(CACHE_DIR)/.done
 
-$(MAKO_script): $(MAKO_SRC_script)
+$(MAKO_style): $(MAKO_SRC_style)
 	PYTHONPATH=$(MAKO_ZIP) python -c "from mako.template import Template; print(Template(filename='$<').render())" > $@
 
 
diff --git a/src/components/script/script.rc b/src/components/script/script.rc
index fd76c0e975e..b55f7ca4847 100644
--- a/src/components/script/script.rc
+++ b/src/components/script/script.rc
@@ -17,7 +17,6 @@ extern mod hubbub;
 extern mod js;
 extern mod netsurfcss;
 extern mod newcss (name = "css");
-extern mod cssparser;
 extern mod servo_net (name = "net");
 extern mod servo_util (name = "util");
 extern mod servo_msg (name = "msg");
@@ -143,7 +142,3 @@ pub mod html {
 
 pub mod layout_interface;
 pub mod script_task;
-
-
-// "New" (as of 2013-08) style system, not used yet but included to avoid bitrot.
-mod style;
diff --git a/src/components/script/style/mod.rs b/src/components/script/style/mod.rs
deleted file mode 100644
index d8d719fabdc..00000000000
--- a/src/components/script/style/mod.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-// The "real" public API
-pub use self::selector_matching::{Stylist, StylesheetOrigin};
-
-
-// Things that need to be public to make the compiler happy
-pub mod stylesheets;
-pub mod errors;
-pub mod selectors;
-pub mod selector_matching;
-pub mod properties;
-pub mod namespaces;
-pub mod media_queries;
-pub mod parsing_utils;
-
-#[cfg(test)]
-mod tests;
diff --git a/src/components/script/style/README.md b/src/components/style/README.md
similarity index 100%
rename from src/components/script/style/README.md
rename to src/components/style/README.md
diff --git a/src/components/script/style/errors.rs b/src/components/style/errors.rs
similarity index 100%
rename from src/components/script/style/errors.rs
rename to src/components/style/errors.rs
diff --git a/src/components/script/style/media_queries.rs b/src/components/style/media_queries.rs
similarity index 94%
rename from src/components/script/style/media_queries.rs
rename to src/components/style/media_queries.rs
index cffa9703beb..3266130fcf1 100644
--- a/src/components/script/style/media_queries.rs
+++ b/src/components/style/media_queries.rs
@@ -4,9 +4,9 @@
 
 use std::ascii::StrAsciiExt;
 use cssparser::*;
-use style::errors::{ErrorLoggerIterator, log_css_error};
-use style::stylesheets::{CSSRule, CSSMediaRule, parse_style_rule, parse_nested_at_rule};
-use style::namespaces::NamespaceMap;
+use errors::{ErrorLoggerIterator, log_css_error};
+use stylesheets::{CSSRule, CSSMediaRule, parse_style_rule, parse_nested_at_rule};
+use namespaces::NamespaceMap;
 
 
 pub struct MediaRule {
diff --git a/src/components/script/style/namespaces.rs b/src/components/style/namespaces.rs
similarity index 98%
rename from src/components/script/style/namespaces.rs
rename to src/components/style/namespaces.rs
index 1bb9260b40c..3c94ec3b3ea 100644
--- a/src/components/script/style/namespaces.rs
+++ b/src/components/style/namespaces.rs
@@ -4,7 +4,7 @@
 
 use std::hashmap::HashMap;
 use cssparser::*;
-use style::errors::log_css_error;
+use errors::log_css_error;
 
 pub struct NamespaceMap {
     default: Option<~str>,  // Optional URL
diff --git a/src/components/script/style/parsing_utils.rs b/src/components/style/parsing_utils.rs
similarity index 100%
rename from src/components/script/style/parsing_utils.rs
rename to src/components/style/parsing_utils.rs
diff --git a/src/components/script/style/properties/.gitignore b/src/components/style/properties/.gitignore
similarity index 100%
rename from src/components/script/style/properties/.gitignore
rename to src/components/style/properties/.gitignore
diff --git a/src/components/script/style/properties/Mako-0.8.1.zip b/src/components/style/properties/Mako-0.8.1.zip
similarity index 100%
rename from src/components/script/style/properties/Mako-0.8.1.zip
rename to src/components/style/properties/Mako-0.8.1.zip
diff --git a/src/components/script/style/properties/common_types.rs b/src/components/style/properties/common_types.rs
similarity index 100%
rename from src/components/script/style/properties/common_types.rs
rename to src/components/style/properties/common_types.rs
diff --git a/src/components/script/style/properties/mod.rs.mako b/src/components/style/properties/mod.rs.mako
similarity index 99%
rename from src/components/script/style/properties/mod.rs.mako
rename to src/components/style/properties/mod.rs.mako
index fe0926e6830..448a8b22899 100644
--- a/src/components/script/style/properties/mod.rs.mako
+++ b/src/components/style/properties/mod.rs.mako
@@ -8,8 +8,8 @@ use std::ascii::StrAsciiExt;
 use std::at_vec;
 pub use std::iterator;
 pub use cssparser::*;
-pub use style::errors::{ErrorLoggerIterator, log_css_error};
-pub use style::parsing_utils::*;
+pub use errors::{ErrorLoggerIterator, log_css_error};
+pub use parsing_utils::*;
 pub use self::common_types::*;
 
 pub mod common_types;
diff --git a/src/components/script/style/selector_matching.rs b/src/components/style/selector_matching.rs
similarity index 97%
rename from src/components/script/style/selector_matching.rs
rename to src/components/style/selector_matching.rs
index 22733228a33..9ce4325291b 100644
--- a/src/components/script/style/selector_matching.rs
+++ b/src/components/style/selector_matching.rs
@@ -5,12 +5,12 @@
 use std::ascii::StrAsciiExt;
 use extra::sort::tim_sort;
 
-use style::selectors::*;
-use style::stylesheets::parse_stylesheet;
-use style::media_queries::{Device, Screen};
-use style::properties::{ComputedValues, cascade, PropertyDeclaration};
-use dom::node::{AbstractNode, ScriptView};
-use dom::element::Element;
+use selectors::*;
+use stylesheets::parse_stylesheet;
+use media_queries::{Device, Screen};
+use properties::{ComputedValues, cascade, PropertyDeclaration};
+use script::dom::node::{AbstractNode, ScriptView};
+use script::dom::element::Element;
 
 
 pub enum StylesheetOrigin {
diff --git a/src/components/script/style/selectors.rs b/src/components/style/selectors.rs
similarity index 99%
rename from src/components/script/style/selectors.rs
rename to src/components/style/selectors.rs
index 7d3c35ad3e8..e5d5666c40c 100644
--- a/src/components/script/style/selectors.rs
+++ b/src/components/style/selectors.rs
@@ -5,7 +5,7 @@
 use std::{vec, iterator};
 use std::ascii::StrAsciiExt;
 use cssparser::*;
-use style::namespaces::NamespaceMap;
+use namespaces::NamespaceMap;
 
 
 pub struct Selector {
diff --git a/src/components/style/style.rc b/src/components/style/style.rc
index d80842a555f..2944f074402 100644
--- a/src/components/style/style.rc
+++ b/src/components/style/style.rc
@@ -11,4 +11,25 @@
 #[license = "MPL"];
 #[crate_type = "lib"];
 
+
+extern mod extra;
 extern mod cssparser;
+extern mod script;
+
+
+// The "real" public API
+pub use self::selector_matching::{Stylist, StylesheetOrigin};
+
+
+// Things that need to be public to make the compiler happy
+pub mod stylesheets;
+pub mod errors;
+pub mod selectors;
+pub mod selector_matching;
+pub mod properties;
+pub mod namespaces;
+pub mod media_queries;
+pub mod parsing_utils;
+
+#[cfg(test)]
+mod tests;
diff --git a/src/components/script/style/stylesheets.rs b/src/components/style/stylesheets.rs
similarity index 95%
rename from src/components/script/style/stylesheets.rs
rename to src/components/style/stylesheets.rs
index 7d7e343748d..c0c1394456c 100644
--- a/src/components/script/style/stylesheets.rs
+++ b/src/components/style/stylesheets.rs
@@ -5,12 +5,12 @@
 use std::iterator::Iterator;
 use std::ascii::StrAsciiExt;
 use cssparser::*;
-use style::selectors;
-use style::properties;
-use style::errors::{ErrorLoggerIterator, log_css_error};
-use style::namespaces::{NamespaceMap, parse_namespace_rule};
-use style::media_queries::{MediaRule, parse_media_rule};
-use style::media_queries;
+use selectors;
+use properties;
+use errors::{ErrorLoggerIterator, log_css_error};
+use namespaces::{NamespaceMap, parse_namespace_rule};
+use media_queries::{MediaRule, parse_media_rule};
+use media_queries;
 
 
 pub struct Stylesheet {
diff --git a/src/components/script/style/tests/bootstrap-v3.0.0.css b/src/components/style/tests/bootstrap-v3.0.0.css
similarity index 100%
rename from src/components/script/style/tests/bootstrap-v3.0.0.css
rename to src/components/style/tests/bootstrap-v3.0.0.css
diff --git a/src/components/script/style/tests/mod.rs b/src/components/style/tests/mod.rs
similarity index 100%
rename from src/components/script/style/tests/mod.rs
rename to src/components/style/tests/mod.rs