diff --git a/Makefile.in b/Makefile.in index c086feeb3dd..d5872eebd6a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -226,7 +226,10 @@ 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)) -SRC_script = $(call rwildcard,$(S)src/components/script/,*.rs) $(AUTOGEN_SRC_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) CRATE_script = $(S)src/components/script/script.rc DONE_script = $(B)src/components/script/libscript.dummy @@ -287,6 +290,10 @@ $(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) + PYTHONPATH=$(MAKO_ZIP) python -c "from mako.template import Template; print(Template(filename='$<').render())" > $@ + + $(CACHE_DIR)/.done: mkdir -p $(CACHE_DIR) @touch $@ diff --git a/src/components/script/script.rc b/src/components/script/script.rc index 21a70515c86..7dfb21293d0 100644 --- a/src/components/script/script.rc +++ b/src/components/script/script.rc @@ -17,6 +17,7 @@ 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"); @@ -132,3 +133,6 @@ 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/.gitignore b/src/components/script/style/.gitignore deleted file mode 100644 index 55369470c0c..00000000000 --- a/src/components/script/style/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -*.o -*.a -*.so -*.dylib -*.dll -*.dummy -*.pyc -*-test -Makefile -properties/mod.rs diff --git a/src/components/script/style/LICENSE b/src/components/script/style/LICENSE deleted file mode 100644 index 14e2f777f6c..00000000000 --- a/src/components/script/style/LICENSE +++ /dev/null @@ -1,373 +0,0 @@ -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - 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/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. diff --git a/src/components/script/style/Makefile.in b/src/components/script/style/Makefile.in deleted file mode 100644 index 585705efd53..00000000000 --- a/src/components/script/style/Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ -VPATH=%VPATH% -CSSPARSER_DIR ?= ../rust-cssparser - -CC ?= gcc -CXX ?= g++ -CXXFLAGS ?= -AR ?= ar -RUSTC ?= rustc -RUSTFLAGS ?= -L $(CSSPARSER_DIR) - - -PROPERTIES_RS=$(VPATH)/properties/mod.rs -RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs') $(CSSPARSER_DIR)/libcssparser.dummy $(PROPERTIES_RS) - -.PHONY: all -all: libservo-style.dummy - -libservo-style.dummy: servo-style.rc $(RUST_SRC) - $(RUSTC) $(RUSTFLAGS) $< - touch $@ - -servo-style-test: servo-style.rc $(RUST_SRC) - $(RUSTC) $(RUSTFLAGS) $< -o $@ --test - -.PHONY: check -check: servo-style-test - ./servo-style-test - -.PHONY: check-debug -check-debug: servo-style-tests - echo -e "start\n break upcall_fail\n continue\n where\n continue" | gdb -q ./servo-style-tests - -.PHONY: clean -clean: - rm -f *.o *.a *.so *.dylib *.dll *.dummy *-test - - -$(PROPERTIES_RS): $(PROPERTIES_RS).mako - PYTHONPATH=$(VPATH)/Mako-0.8.1.zip python -c "from mako.template import Template; print(Template(filename='$<').render())" > $@ diff --git a/src/components/script/style/README.md b/src/components/script/style/README.md index fd3bb045639..6a77ba5611c 100644 --- a/src/components/script/style/README.md +++ b/src/components/script/style/README.md @@ -4,7 +4,3 @@ servo-style Prototype replacement style system for Servo, based on [rust-cssparser](https://github.com/mozilla-servo/rust-cssparser) instead of [NetSurf’s libcss](https://github.com/mozilla-servo/libcss). - -This is meant to go into Servo’s `src/components/script/style` directory, -but is maintained here for now because it requires at least -Rust ecfc9a8 (2013-08-12). diff --git a/src/components/script/style/configure b/src/components/script/style/configure deleted file mode 100755 index 62a0f4cd3e6..00000000000 --- a/src/components/script/style/configure +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -SRCDIR="$(cd $(dirname $0) && pwd)" -sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile diff --git a/src/components/script/style/media_queries.rs b/src/components/script/style/media_queries.rs index 3266130fcf1..cffa9703beb 100644 --- a/src/components/script/style/media_queries.rs +++ b/src/components/script/style/media_queries.rs @@ -4,9 +4,9 @@ use std::ascii::StrAsciiExt; use cssparser::*; -use errors::{ErrorLoggerIterator, log_css_error}; -use stylesheets::{CSSRule, CSSMediaRule, parse_style_rule, parse_nested_at_rule}; -use namespaces::NamespaceMap; +use style::errors::{ErrorLoggerIterator, log_css_error}; +use style::stylesheets::{CSSRule, CSSMediaRule, parse_style_rule, parse_nested_at_rule}; +use style::namespaces::NamespaceMap; pub struct MediaRule { diff --git a/src/components/script/style/mod.rs b/src/components/script/style/mod.rs new file mode 100644 index 00000000000..8ed3bf918f7 --- /dev/null +++ b/src/components/script/style/mod.rs @@ -0,0 +1,7 @@ +pub mod stylesheets; +pub mod errors; +pub mod selectors; +pub mod properties; +pub mod namespaces; +pub mod media_queries; +pub mod parsing_utils; diff --git a/src/components/script/style/namespaces.rs b/src/components/script/style/namespaces.rs index 3c94ec3b3ea..1bb9260b40c 100644 --- a/src/components/script/style/namespaces.rs +++ b/src/components/script/style/namespaces.rs @@ -4,7 +4,7 @@ use std::hashmap::HashMap; use cssparser::*; -use errors::log_css_error; +use style::errors::log_css_error; pub struct NamespaceMap { default: Option<~str>, // Optional URL diff --git a/src/components/script/style/properties/.gitignore b/src/components/script/style/properties/.gitignore new file mode 100644 index 00000000000..73abffdd5d0 --- /dev/null +++ b/src/components/script/style/properties/.gitignore @@ -0,0 +1 @@ +mod.rs diff --git a/src/components/script/style/Mako-0.8.1.zip b/src/components/script/style/properties/Mako-0.8.1.zip similarity index 100% rename from src/components/script/style/Mako-0.8.1.zip rename to src/components/script/style/properties/Mako-0.8.1.zip diff --git a/src/components/script/style/properties/mod.rs.mako b/src/components/script/style/properties/mod.rs.mako index 8b3417263df..3d6227417f4 100644 --- a/src/components/script/style/properties/mod.rs.mako +++ b/src/components/script/style/properties/mod.rs.mako @@ -5,10 +5,10 @@ // This file is a Mako template: http://www.makotemplates.org/ use std::ascii::StrAsciiExt; -use errors::{ErrorLoggerIterator, log_css_error}; pub use std::iterator; pub use cssparser::*; -pub use parsing_utils::*; +pub use style::errors::{ErrorLoggerIterator, log_css_error}; +pub use style::parsing_utils::*; pub use self::common_types::*; pub mod common_types; diff --git a/src/components/script/style/selectors.rs b/src/components/script/style/selectors.rs index 2cacb177b54..3945b3240f7 100644 --- a/src/components/script/style/selectors.rs +++ b/src/components/script/style/selectors.rs @@ -5,7 +5,7 @@ use std::{vec, iterator}; use std::ascii::StrAsciiExt; use cssparser::*; -use namespaces::NamespaceMap; +use style::namespaces::NamespaceMap; pub struct Selector { diff --git a/src/components/script/style/servo-style.rc b/src/components/script/style/servo-style.rc deleted file mode 100644 index c4b891dd2d7..00000000000 --- a/src/components/script/style/servo-style.rc +++ /dev/null @@ -1,17 +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/. */ - -#[link(name = "servo-style", vers = "0.1")]; -#[crate_type = "lib"]; - -extern mod extra; -extern mod cssparser; - -pub mod stylesheets; -pub mod errors; -pub mod selectors; -pub mod properties; -pub mod namespaces; -pub mod media_queries; -pub mod parsing_utils; diff --git a/src/components/script/style/stylesheets.rs b/src/components/script/style/stylesheets.rs index 5d9d5a2a9fa..4fb13611bba 100644 --- a/src/components/script/style/stylesheets.rs +++ b/src/components/script/style/stylesheets.rs @@ -5,12 +5,12 @@ use std::iterator::Iterator; use std::ascii::StrAsciiExt; use cssparser::*; -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; +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; pub struct Stylesheet { diff --git a/src/support/css/rust-cssparser b/src/support/css/rust-cssparser index 8700565717e..38d1caae638 160000 --- a/src/support/css/rust-cssparser +++ b/src/support/css/rust-cssparser @@ -1 +1 @@ -Subproject commit 8700565717e8c94f6615761f074dafe8e6283d9f +Subproject commit 38d1caae638b28bbfbbbc988b0b841e973345243