Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move geckolib/selector_impl.rs -> style/gecko_selector_impl.rs

Browse source
This commit is contained in:
Simon Sapin 2016-07-19 15:34:08 +02:00
parent db3607471f
commit 2f967893f3
5 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ports/geckolib/selector_impl.rs → components/style/gecko_selector_impl.rs
View file

@ -2,18 +2,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use properties::GeckoComputedValues; use element_state::ElementState;
use gecko_properties::GeckoComputedValues;
use selector_impl::{PseudoElementCascadeType, SelectorImplExt};
use selectors::parser::{ParserContext, SelectorImpl}; use selectors::parser::{ParserContext, SelectorImpl};
use string_cache::Atom; use string_cache::Atom;
use style;
use style::element_state::ElementState;
use style::selector_impl::{PseudoElementCascadeType, SelectorImplExt};
pub type Stylist = style::selector_matching::Stylist<GeckoSelectorImpl>; pub type Stylist = ::selector_matching::Stylist<GeckoSelectorImpl>;
pub type Stylesheet = style::stylesheets::Stylesheet<GeckoSelectorImpl>; pub type Stylesheet = ::stylesheets::Stylesheet<GeckoSelectorImpl>;
pub type SharedStyleContext = style::context::SharedStyleContext<GeckoSelectorImpl>; pub type SharedStyleContext = ::context::SharedStyleContext<GeckoSelectorImpl>;
pub type PrivateStyleData = style::data::PrivateStyleData<GeckoSelectorImpl, GeckoComputedValues>; pub type PrivateStyleData = ::data::PrivateStyleData<GeckoSelectorImpl, GeckoComputedValues>;
pub type Animation = style::animation::Animation<GeckoSelectorImpl>; pub type Animation = ::animation::Animation<GeckoSelectorImpl>;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct GeckoSelectorImpl; pub struct GeckoSelectorImpl;
@ -135,8 +134,8 @@ pub enum NonTSPseudoClass {
impl NonTSPseudoClass { impl NonTSPseudoClass {
pub fn state_flag(&self) -> ElementState { pub fn state_flag(&self) -> ElementState {
use element_state::*;
use self::NonTSPseudoClass::*; use self::NonTSPseudoClass::*;
use style::element_state::*;
match *self { match *self {
Active => IN_ACTIVE_STATE, Active => IN_ACTIVE_STATE,
Focus => IN_FOCUS_STATE, Focus => IN_FOCUS_STATE,

3
components/style/lib.rs
View file

@ -82,8 +82,9 @@ pub mod element_state;
pub mod error_reporting; pub mod error_reporting;
pub mod font_face; pub mod font_face;
#[cfg(feature = "gecko")] pub mod gecko_conversions; #[cfg(feature = "gecko")] pub mod gecko_conversions;
#[cfg(feature = "gecko")] pub mod gecko_values;
#[cfg(feature = "gecko")] pub mod gecko_glue; #[cfg(feature = "gecko")] pub mod gecko_glue;
#[cfg(feature = "gecko")] pub mod gecko_selector_impl;
#[cfg(feature = "gecko")] pub mod gecko_values;
pub mod keyframes; pub mod keyframes;
pub mod logical_geometry; pub mod logical_geometry;
pub mod matching; pub mod matching;

1
ports/geckolib/Cargo.lock generated
View file

@ -3,7 +3,6 @@ name = "geckoservo"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "app_units 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
"cssparser 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gecko_bindings 0.0.1", "gecko_bindings 0.0.1",

1
ports/geckolib/Cargo.toml
View file

@ -11,7 +11,6 @@ crate-type = ["staticlib"]
[dependencies] [dependencies]
app_units = "0.2.5" app_units = "0.2.5"
cssparser = "0.5.4"
env_logger = "0.3" env_logger = "0.3"
euclid = "0.7.1" euclid = "0.7.1"
gecko_bindings = {version = "0.0.1", path = "gecko_bindings"} gecko_bindings = {version = "0.0.1", path = "gecko_bindings"}

4
ports/geckolib/lib.rs
View file

@ -3,8 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
extern crate app_units; extern crate app_units;
#[macro_use]
extern crate cssparser;
extern crate env_logger; extern crate env_logger;
extern crate euclid; extern crate euclid;
extern crate gecko_bindings; extern crate gecko_bindings;
@ -26,11 +24,11 @@ mod context;
mod data; mod data;
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub mod glue; pub mod glue;
mod selector_impl;
mod traversal; mod traversal;
mod wrapper; mod wrapper;
pub use style::gecko_properties as properties; pub use style::gecko_properties as properties;
pub use style::gecko_selector_impl as selector_impl;
pub use style::gecko_values as values; pub use style::gecko_values as values;
// FIXME(bholley): This should probably go away once we harmonize the allocators. // FIXME(bholley): This should probably go away once we harmonize the allocators.