Move gecko_* into style::gecko

Prepping for the next stage where most of geckolib/ is popped in here

components/style/gecko/conversions.rs

@@ -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::*;

components/style/gecko/selector_impl.rs

@@ -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]

components/style/lib.rs

@@ -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;

components/style/properties/gecko.mako.rs

@@ -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::{StyleCoordHelpers, GeckoStyleCoordConvertible, convert_nscolor_to_rgba};
-use gecko_values::convert_rgba_to_nscolor;
+use gecko::values::convert_rgba_to_nscolor;
-use gecko_values::round_border_to_device_pixels;
+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::conversions::basic_shape::set_corners_from_radius;
-        use gecko_values::GeckoStyleCoordConvertible;
+        use gecko::values::GeckoStyleCoordConvertible;
         use values::computed::basic_shape::*;
         let ref mut clip_path = self.gecko.mClipPath;
         // clean up existing struct

components/style/selector_impl.rs

@@ -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.
 ///

ports/geckolib/glue.rs

@@ -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;

ports/geckolib/wrapper.rs

@@ -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>);