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

Move gecko_* into style::gecko

Browse source 
Prepping for the next stage where most of geckolib/ is popped in here
This commit is contained in:
Manish Goregaokar 2016-09-22 16:05:14 +05:30
parent c6787458d9
commit bc9cbc87ba
8 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/gecko_conversions.rs → components/style/gecko/conversions.rs
View file

@ -112,7 +112,7 @@ pub mod basic_shape {
use gecko_bindings::structs::{nsStyleCoord, nsStyleCorners};
use gecko_bindings::structs::StyleClipPathGeometryBox;
use gecko_bindings::sugar::ns_style_coord::{CoordDataMut, CoordDataValue};
use gecko_values::GeckoStyleCoordConvertible;
use gecko::values::GeckoStyleCoordConvertible;
use std::borrow::Borrow;
use values::computed::{BorderRadiusSize, LengthOrPercentage};
use values::computed::basic_shape::*;

6
components/style/gecko_selector_impl.rs → components/style/gecko/selector_impl.rs
View file

@ -70,7 +70,7 @@ impl PseudoElement {
}}
}
include!("generated/gecko_pseudo_element_helper.rs");
include!("../generated/gecko_pseudo_element_helper.rs");
None
}
@ -88,7 +88,7 @@ impl PseudoElement {
}}
}
include!("generated/gecko_pseudo_element_helper.rs");
include!("../generated/gecko_pseudo_element_helper.rs");
None
}
@ -238,7 +238,7 @@ impl GeckoSelectorImpl {
}}
}
include!("generated/gecko_pseudo_element_helper.rs")
include!("../generated/gecko_pseudo_element_helper.rs")
}
#[inline]

0
components/style/gecko_values.rs → components/style/gecko/values.rs
View file

4
components/style/lib.rs
View file

@ -90,10 +90,8 @@ pub mod domrefcell;
pub mod element_state;
pub mod error_reporting;
pub mod font_face;
#[cfg(feature = "gecko")] pub mod gecko_conversions;
#[cfg(feature = "gecko")] #[allow(unsafe_code)] pub mod gecko;
#[cfg(feature = "gecko")] #[allow(unsafe_code)] pub mod gecko_bindings;
#[cfg(feature = "gecko")] pub mod gecko_selector_impl;
#[cfg(feature = "gecko")] pub mod gecko_values;
pub mod keyframes;
pub mod logical_geometry;
pub mod matching;

10
components/style/properties/gecko.mako.rs
View file

@ -27,9 +27,9 @@ use gecko_bindings::bindings::{Gecko_FontFamilyList_Clear, Gecko_InitializeImage
use gecko_bindings::bindings::ServoComputedValuesBorrowedOrNull;
use gecko_bindings::structs;
use gecko_bindings::sugar::ns_style_coord::{CoordDataValue, CoordData, CoordDataMut};
use gecko_values::{StyleCoordHelpers, GeckoStyleCoordConvertible, convert_nscolor_to_rgba};
use gecko_values::convert_rgba_to_nscolor;
use gecko_values::round_border_to_device_pixels;
use gecko::values::{StyleCoordHelpers, GeckoStyleCoordConvertible, convert_nscolor_to_rgba};
use gecko::values::convert_rgba_to_nscolor;
use gecko::values::round_border_to_device_pixels;
use logical_geometry::WritingMode;
use properties::CascadePropertyFn;
use properties::longhands;
@ -1622,8 +1622,8 @@ clip-path
use gecko_bindings::structs::StyleClipPathGeometryBox;
use gecko_bindings::structs::{StyleBasicShape, StyleBasicShapeType, StyleShapeSourceType};
use gecko_bindings::structs::{StyleClipPath, StyleFillRule};
use gecko_conversions::basic_shape::set_corners_from_radius;
use gecko_values::GeckoStyleCoordConvertible;
use gecko::conversions::basic_shape::set_corners_from_radius;
use gecko::values::GeckoStyleCoordConvertible;
use values::computed::basic_shape::*;
let ref mut clip_path = self.gecko.mClipPath;
// clean up existing struct

4
components/style/selector_impl.rs
View file

@ -18,10 +18,10 @@ pub use servo_selector_impl::*;
pub use servo_selector_impl::{ServoSelectorImpl as TheSelectorImpl, ServoElementSnapshot as ElementSnapshot};
#[cfg(feature = "gecko")]
pub use gecko_selector_impl::*;
pub use gecko::selector_impl::*;
#[cfg(feature = "gecko")]
pub use gecko_selector_impl::{GeckoSelectorImpl as TheSelectorImpl};
pub use gecko::selector_impl::{GeckoSelectorImpl as TheSelectorImpl};
/// This function determines if a pseudo-element is eagerly cascaded or not.
///

2
ports/geckolib/glue.rs
View file

@ -34,13 +34,13 @@ use style::arc_ptr_eq;
use style::context::{LocalStyleContextCreationInfo, ReflowGoal, SharedStyleContext};
use style::dom::{NodeInfo, TDocument, TElement, TNode};
use style::error_reporting::StdoutErrorReporter;
use style::gecko_selector_impl::{GeckoSelectorImpl, PseudoElement};
use style::parallel;
use style::parser::ParserContextExtraData;
use style::properties::{ComputedValues, PropertyDeclarationBlock, parse_one_declaration};
use style::selector_impl::PseudoElementCascadeType;
use style::sequential;
use style::stylesheets::{Origin, Stylesheet};
use style::gecko::selector_impl::{GeckoSelectorImpl, PseudoElement};
use style::timer::Timer;
use traversal::RecalcStyleOnly;
use url::Url;

2
ports/geckolib/wrapper.rs
View file

@ -41,7 +41,6 @@ use style::dom::{LayoutIterator, NodeInfo, TDocument, TElement, TNode, TRestyleD
use style::dom::{OpaqueNode, PresentationalHintsSynthetizer};
use style::element_state::ElementState;
use style::error_reporting::StdoutErrorReporter;
use style::gecko_selector_impl::{GeckoSelectorImpl, NonTSPseudoClass, PseudoElement};
use style::parser::ParserContextExtraData;
use style::properties::{ComputedValues, parse_style_attribute};
use style::properties::PropertyDeclarationBlock;
@ -49,6 +48,7 @@ use style::refcell::{Ref, RefCell, RefMut};
use style::selector_impl::ElementExt;
use style::selector_matching::ApplicableDeclarationBlock;
use style::sink::Push;
use style::gecko::selector_impl::{GeckoSelectorImpl, NonTSPseudoClass, PseudoElement};
use url::Url;
pub struct NonOpaqueStyleData(RefCell<PrivateStyleData>);