diff options
40 files changed, 50 insertions, 83 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs index a1d27506da3..4f6bf28004b 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -56,10 +56,9 @@ use std::fmt; use std::sync::Arc; use style::computed_values::{border_collapse, box_sizing, display, float, overflow_x, overflow_y}; use style::computed_values::{position, text_align, transform, transform_style}; -use style::context::StyleContext; +use style::context::{SharedStyleContext, StyleContext}; use style::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize, WritingMode}; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use style::values::computed::{LengthOrNone, LengthOrPercentageOrNone}; use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto}; use util::geometry::MAX_RECT; diff --git a/components/layout/construct.rs b/components/layout/construct.rs index ba87cfd9dbc..809ecaa406a 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -46,8 +46,8 @@ use std::sync::atomic::Ordering; use style::computed_values::content::ContentItem; use style::computed_values::position; use style::computed_values::{caption_side, display, empty_cells, float, list_style_position}; +use style::context::SharedStyleContext; use style::properties::{self, ServoComputedValues}; -use style::servo::SharedStyleContext; use table::TableFlow; use table_caption::TableCaptionFlow; use table_cell::TableCellFlow; diff --git a/components/layout/context.rs b/components/layout/context.rs index b81dfe09455..02d4bdd8b8d 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -24,8 +24,7 @@ use std::collections::HashMap; use std::hash::BuildHasherDefault; use std::rc::Rc; use std::sync::{Arc, Mutex, RwLock}; -use style::context::{LocalStyleContext, StyleContext}; -use style::servo::SharedStyleContext; +use style::context::{LocalStyleContext, StyleContext, SharedStyleContext}; use url::Url; use util::opts; diff --git a/components/layout/data.rs b/components/layout/data.rs index d189814f788..167b87e6f1a 100644 --- a/components/layout/data.rs +++ b/components/layout/data.rs @@ -4,7 +4,7 @@ use construct::ConstructionResult; use script_layout_interface::restyle_damage::RestyleDamage; -use style::servo::PrivateStyleData; +use style::data::PrivateStyleData; /// Data that layout associates with a node. pub struct PrivateLayoutData { diff --git a/components/layout/flex.rs b/components/layout/flex.rs index 7392ccaf542..62ad1073fe2 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -25,9 +25,9 @@ use script_layout_interface::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; use std::cmp::max; use std::sync::Arc; use style::computed_values::flex_direction; +use style::context::SharedStyleContext; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone}; /// The size of an axis. May be a specified size, a min/max diff --git a/components/layout/flow.rs b/components/layout/flow.rs index 7be81faa0d6..29102690a4d 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -50,10 +50,10 @@ use std::sync::Arc; use std::sync::atomic::Ordering; use std::{fmt, mem, raw}; use style::computed_values::{clear, display, empty_cells, float, position, overflow_x, text_align}; +use style::context::SharedStyleContext; use style::dom::TRestyleDamage; use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; use style::properties::{self, ServoComputedValues}; -use style::servo::SharedStyleContext; use style::values::computed::LengthOrPercentageOrAuto; use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, TableFlow}; use table_caption::TableCaptionFlow; diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 8c6e9c4f337..f734e66eb6a 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -35,10 +35,9 @@ use std::{fmt, i32, isize, mem}; use style::arc_ptr_eq; use style::computed_values::{display, overflow_x, position, text_align, text_justify}; use style::computed_values::{text_overflow, vertical_align, white_space}; -use style::context::StyleContext; +use style::context::{SharedStyleContext, StyleContext}; use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use style::values::computed::LengthOrPercentage; use text; use unicode_bidi; diff --git a/components/layout/list_item.rs b/components/layout/list_item.rs index 84a9b1322e4..313510368e8 100644 --- a/components/layout/list_item.rs +++ b/components/layout/list_item.rs @@ -23,9 +23,9 @@ use inline::InlineMetrics; use script_layout_interface::restyle_damage::RESOLVE_GENERATED_CONTENT; use std::sync::Arc; use style::computed_values::{list_style_type, position}; +use style::context::SharedStyleContext; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use text; /// A block with the CSS `display` property equal to `list-item`. diff --git a/components/layout/multicol.rs b/components/layout/multicol.rs index a30fbaf1a02..f440fdb34b3 100644 --- a/components/layout/multicol.rs +++ b/components/layout/multicol.rs @@ -21,10 +21,9 @@ use gfx_traits::print_tree::PrintTree; use std::cmp::{min, max}; use std::fmt; use std::sync::Arc; -use style::context::StyleContext; +use style::context::{StyleContext, SharedStyleContext}; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use style::values::computed::{LengthOrPercentageOrAuto, LengthOrPercentageOrNone}; pub struct MulticolFlow { diff --git a/components/layout/query.rs b/components/layout/query.rs index 7467c80fffb..aed02a9392e 100644 --- a/components/layout/query.rs +++ b/components/layout/query.rs @@ -34,7 +34,7 @@ use style::logical_geometry::{WritingMode, BlockFlowDirection, InlineBaseDirecti use style::properties::longhands::{display, position}; use style::properties::style_structs; use style::selector_impl::PseudoElement; -use style::servo::Stylist; +use style::selector_matching::Stylist; use style::values::LocalToCss; use style_traits::cursor::Cursor; use wrapper::ThreadSafeLayoutNodeHelpers; diff --git a/components/layout/table.rs b/components/layout/table.rs index a78580c565a..62d506c7b4a 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -26,9 +26,9 @@ use std::cmp; use std::fmt; use std::sync::Arc; use style::computed_values::{border_collapse, border_spacing, table_layout}; +use style::context::SharedStyleContext; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use style::values::CSSFloat; use style::values::computed::LengthOrPercentageOrAuto; use table_row::TableRowFlow; diff --git a/components/layout/table_caption.rs b/components/layout/table_caption.rs index aaa038a4b57..9c8aa2b0724 100644 --- a/components/layout/table_caption.rs +++ b/components/layout/table_caption.rs @@ -18,9 +18,9 @@ use gfx_traits::StackingContextId; use gfx_traits::print_tree::PrintTree; use std::fmt; use std::sync::Arc; +use style::context::SharedStyleContext; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; /// A table formatting context. pub struct TableCaptionFlow { diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs index 691a3483444..a71b78b8ace 100644 --- a/components/layout/table_cell.rs +++ b/components/layout/table_cell.rs @@ -24,9 +24,9 @@ use script_layout_interface::wrapper_traits::ThreadSafeLayoutNode; use std::fmt; use std::sync::Arc; use style::computed_values::{border_collapse, border_top_style, vertical_align}; +use style::context::SharedStyleContext; use style::logical_geometry::{LogicalMargin, LogicalRect, LogicalSize, WritingMode}; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use table::InternalTable; use table_row::{CollapsedBorder, CollapsedBorderProvenance}; diff --git a/components/layout/table_colgroup.rs b/components/layout/table_colgroup.rs index f1041e24107..fb8f0048c3c 100644 --- a/components/layout/table_colgroup.rs +++ b/components/layout/table_colgroup.rs @@ -18,9 +18,9 @@ use layout_debug; use std::cmp::max; use std::fmt; use std::sync::Arc; +use style::context::SharedStyleContext; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use style::values::computed::LengthOrPercentageOrAuto; /// A table formatting context. diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs index ae931481ddd..8fd0255f261 100644 --- a/components/layout/table_row.rs +++ b/components/layout/table_row.rs @@ -26,9 +26,9 @@ use std::fmt; use std::iter::{Enumerate, IntoIterator, Peekable}; use std::sync::Arc; use style::computed_values::{border_collapse, border_spacing, border_top_style}; +use style::context::SharedStyleContext; use style::logical_geometry::{LogicalSize, PhysicalSide, WritingMode}; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use style::values::computed::LengthOrPercentageOrAuto; use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable, VecExt}; use table_cell::{CollapsedBordersForCell, TableCellFlow}; diff --git a/components/layout/table_rowgroup.rs b/components/layout/table_rowgroup.rs index 26f828e8765..3422401d20e 100644 --- a/components/layout/table_rowgroup.rs +++ b/components/layout/table_rowgroup.rs @@ -22,9 +22,9 @@ use std::fmt; use std::iter::{IntoIterator, Iterator, Peekable}; use std::sync::Arc; use style::computed_values::{border_collapse, border_spacing}; +use style::context::SharedStyleContext; use style::logical_geometry::{LogicalSize, WritingMode}; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, InternalTable, TableLikeFlow}; use table_row; diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs index e8fec9e94e6..8b554ea20b4 100644 --- a/components/layout/table_wrapper.rs +++ b/components/layout/table_wrapper.rs @@ -31,9 +31,9 @@ use std::fmt; use std::ops::Add; use std::sync::Arc; use style::computed_values::{border_collapse, table_layout}; +use style::context::SharedStyleContext; use style::logical_geometry::LogicalSize; use style::properties::ServoComputedValues; -use style::servo::SharedStyleContext; use style::values::CSSFloat; use style::values::computed::LengthOrPercentageOrAuto; use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize}; diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index 194e72bddcc..1362f1cb7b2 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -13,9 +13,9 @@ use gfx::display_list::OpaqueNode; use script_layout_interface::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, RestyleDamage}; use script_layout_interface::wrapper_traits::{LayoutNode, ThreadSafeLayoutNode}; use std::mem; +use style::context::SharedStyleContext; use style::dom::TNode; use style::selector_impl::ServoSelectorImpl; -use style::servo::SharedStyleContext; use style::traversal::{DomTraversalContext, remove_from_bloom_filter, recalc_style_at}; use util::opts; use wrapper::{LayoutNodeLayoutData, ThreadSafeLayoutNodeHelpers}; diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index f6cfc31e030..7fc12535ff7 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -98,17 +98,18 @@ use std::ops::{Deref, DerefMut}; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::mpsc::{channel, Sender, Receiver}; use std::sync::{Arc, Mutex, MutexGuard, RwLock}; +use style::animation::Animation; use style::computed_values::{filter, mix_blend_mode}; -use style::context::ReflowGoal; +use style::context::{ReflowGoal, LocalStyleContextCreationInfo, SharedStyleContext}; use style::dom::{TDocument, TElement, TNode}; use style::error_reporting::ParseErrorReporter; use style::logical_geometry::LogicalPoint; use style::media_queries::{Device, MediaType}; use style::parallel::WorkQueueData; use style::refcell::RefCell; -use style::servo::{Animation, LocalStyleContextCreationInfo, SharedStyleContext, Stylesheet, Stylist}; +use style::selector_matching::Stylist; use style::servo_selector_impl::USER_OR_USER_AGENT_STYLESHEETS; -use style::stylesheets::CSSRuleIteratorExt; +use style::stylesheets::{Stylesheet, CSSRuleIteratorExt}; use style::workqueue::WorkQueue; use url::Url; use util::geometry::MAX_RECT; diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 09d58c55e1e..ff438eb7bf5 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -123,8 +123,8 @@ use string_cache::{Atom, QualName}; use style::attr::AttrValue; use style::context::ReflowGoal; use style::restyle_hints::ElementSnapshot; -use style::servo::Stylesheet; use style::str::{split_html_space_chars, str_join}; +use style::stylesheets::Stylesheet; use time; use url::Url; use url::percent_encoding::percent_decode; diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index b341ad59a1f..d089caed3f5 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -39,9 +39,8 @@ use string_cache::Atom; use style::attr::AttrValue; use style::media_queries::{MediaQueryList, parse_media_query_list}; use style::parser::ParserContextExtraData; -use style::servo::Stylesheet; use style::str::HTML_SPACE_CHARACTERS; -use style::stylesheets::Origin; +use style::stylesheets::{Stylesheet, Origin}; use url::Url; no_jsmanaged_fields!(Stylesheet); diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 724534dfdb6..b8c2cd423fa 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -20,9 +20,8 @@ use std::ascii::AsciiExt; use std::sync::Arc; use string_cache::Atom; use style::attr::AttrValue; -use style::servo::Stylesheet; use style::str::HTML_SPACE_CHARACTERS; -use style::stylesheets::{CSSRule, Origin}; +use style::stylesheets::{Stylesheet, CSSRule, Origin}; use style::viewport::ViewportRule; #[dom_struct] diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index e253fab12be..c7cc4cc44a3 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -19,8 +19,7 @@ use std::sync::Arc; use string_cache::Atom; use style::media_queries::parse_media_query_list; use style::parser::ParserContextExtraData; -use style::servo::Stylesheet; -use style::stylesheets::Origin; +use style::stylesheets::{Stylesheet, Origin}; #[dom_struct] pub struct HTMLStyleElement { diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index 53c8cc27c01..8f22c369e4c 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -54,13 +54,14 @@ use std::mem::{transmute, transmute_copy}; use string_cache::{Atom, BorrowedAtom, BorrowedNamespace, Namespace}; use style::attr::AttrValue; use style::computed_values::display; +use style::context::SharedStyleContext; +use style::data::PrivateStyleData; use style::dom::{PresentationalHintsSynthetizer, OpaqueNode, TDocument, TElement, TNode, UnsafeNode}; use style::element_state::*; use style::properties::{PropertyDeclaration, PropertyDeclarationBlock}; use style::refcell::{Ref, RefCell, RefMut}; use style::restyle_hints::ElementSnapshot; use style::selector_impl::{NonTSPseudoClass, ServoSelectorImpl}; -use style::servo::{PrivateStyleData, SharedStyleContext}; use style::sink::Push; use style::str::is_whitespace; use url::Url; diff --git a/components/script_layout_interface/lib.rs b/components/script_layout_interface/lib.rs index 805deb45349..d3554422dd7 100644 --- a/components/script_layout_interface/lib.rs +++ b/components/script_layout_interface/lib.rs @@ -52,8 +52,8 @@ use core::nonzero::NonZero; use ipc_channel::ipc::IpcSender; use libc::c_void; use restyle_damage::RestyleDamage; +use style::data::PrivateStyleData; use style::refcell::RefCell; -use style::servo::PrivateStyleData; pub struct PartialStyleAndLayoutData { pub style_data: PrivateStyleData, diff --git a/components/script_layout_interface/message.rs b/components/script_layout_interface/message.rs index a2b92853218..22370b043c3 100644 --- a/components/script_layout_interface/message.rs +++ b/components/script_layout_interface/message.rs @@ -18,7 +18,7 @@ use std::sync::mpsc::{Receiver, Sender}; use string_cache::Atom; use style::context::ReflowGoal; use style::selector_impl::PseudoElement; -use style::servo::Stylesheet; +use style::stylesheets::Stylesheet; use url::Url; use util::ipc::OptionalOpaqueIpcSender; use {OpaqueStyleAndLayoutData, TrustedNodeAddress}; diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs index bdbf31c37c8..0f7d4864179 100644 --- a/components/script_layout_interface/wrapper_traits.rs +++ b/components/script_layout_interface/wrapper_traits.rs @@ -13,12 +13,12 @@ use restyle_damage::RestyleDamage; use std::sync::Arc; use string_cache::{Atom, BorrowedAtom, BorrowedNamespace, Namespace}; use style::computed_values::display; +use style::context::SharedStyleContext; use style::dom::OpaqueNode; use style::dom::{PresentationalHintsSynthetizer, TNode}; use style::properties::ServoComputedValues; use style::refcell::{Ref, RefCell}; use style::selector_impl::{PseudoElement, PseudoElementCascadeType, ServoSelectorImpl}; -use style::servo::SharedStyleContext; use url::Url; #[derive(Copy, PartialEq, Clone)] diff --git a/components/style/gecko_selector_impl.rs b/components/style/gecko_selector_impl.rs index df8ea06ea52..ed99fd39758 100644 --- a/components/style/gecko_selector_impl.rs +++ b/components/style/gecko_selector_impl.rs @@ -6,12 +6,7 @@ use element_state::ElementState; use selector_impl::{PseudoElementCascadeType, SelectorImplExt}; use selectors::parser::{ParserContext, SelectorImpl}; use string_cache::Atom; - -pub type Stylist = ::selector_matching::Stylist; -pub type Stylesheet = ::stylesheets::Stylesheet; -pub type SharedStyleContext = ::context::SharedStyleContext; -pub type PrivateStyleData = ::data::PrivateStyleData; -pub type Animation = ::animation::Animation; +use stylesheets::Stylesheet; #[derive(Debug, Clone, PartialEq, Eq)] pub struct GeckoSelectorImpl; diff --git a/components/style/lib.rs b/components/style/lib.rs index 88144ec9dda..673e8311b02 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -96,7 +96,6 @@ pub mod restyle_hints; pub mod selector_impl; pub mod selector_matching; pub mod sequential; -pub mod servo; #[cfg(feature = "servo")] pub mod servo_selector_impl; pub mod sink; pub mod str; diff --git a/components/style/servo.rs b/components/style/servo.rs deleted file mode 100644 index b427d85db04..00000000000 --- a/components/style/servo.rs +++ /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/. */ -//! Concrete types for servo Style implementation - -use animation; -use context; -use data; -use selector_matching; -use stylesheets; - -pub type Stylesheet = stylesheets::Stylesheet; -pub type PrivateStyleData = data::PrivateStyleData; -pub type Stylist = selector_matching::Stylist; -pub type SharedStyleContext = context::SharedStyleContext; -pub type LocalStyleContextCreationInfo = context::LocalStyleContextCreationInfo; -pub type Animation = animation::Animation; diff --git a/ports/geckolib/context.rs b/ports/geckolib/context.rs index 1435c27c0a5..a5385f0fee1 100644 --- a/ports/geckolib/context.rs +++ b/ports/geckolib/context.rs @@ -1,10 +1,10 @@ /* 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/. */ -use selector_impl::SharedStyleContext; + use std::cell::RefCell; use std::rc::Rc; -use style::context::{LocalStyleContext, StyleContext}; +use style::context::{LocalStyleContext, StyleContext, SharedStyleContext}; thread_local!(static LOCAL_CONTEXT_KEY: RefCell<Option<Rc<LocalStyleContext>>> = RefCell::new(None)); diff --git a/ports/geckolib/data.rs b/ports/geckolib/data.rs index e50f98261d5..8e0b98b4266 100644 --- a/ports/geckolib/data.rs +++ b/ports/geckolib/data.rs @@ -6,15 +6,18 @@ use euclid::Size2D; use euclid::size::TypedSize2D; use gecko_bindings::bindings::RawServoStyleSet; use num_cpus; -use selector_impl::{Animation, SharedStyleContext, Stylist, Stylesheet}; use std::cmp; use std::collections::HashMap; use std::env; use std::sync::mpsc::{channel, Receiver, Sender}; use std::sync::{Arc, RwLock}; +use style::animation::Animation; +use style::context::SharedStyleContext; use style::dom::OpaqueNode; use style::media_queries::{Device, MediaType}; use style::parallel::WorkQueueData; +use style::selector_matching::Stylist; +use style::stylesheets::Stylesheet; use style::workqueue::WorkQueue; use style_traits::ViewportPx; use util::thread_state; diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 117056fe14c..9d8e8ec5129 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -14,24 +14,23 @@ use gecko_bindings::bindings::{ServoDeclarationBlock, ServoNodeData, ThreadSafeP use gecko_bindings::bindings::{ThreadSafeURIHolder, nsHTMLCSSStyleSheet}; use gecko_bindings::ptr::{GeckoArcPrincipal, GeckoArcURI}; use gecko_bindings::structs::{SheetParsingMode, nsIAtom}; -use properties::ComputedValues; -use selector_impl::{GeckoSelectorImpl, PseudoElement, SharedStyleContext, Stylesheet}; use std::mem::transmute; use std::ptr; use std::slice; use std::str::from_utf8_unchecked; use std::sync::{Arc, Mutex}; use style::arc_ptr_eq; -use style::context::{LocalStyleContextCreationInfo, ReflowGoal}; +use style::context::{LocalStyleContextCreationInfo, ReflowGoal, SharedStyleContext}; use style::dom::{TDocument, TElement, TNode}; use style::error_reporting::StdoutErrorReporter; use style::gecko_glue::ArcHelpers; +use style::gecko_selector_impl::{GeckoSelectorImpl, PseudoElement}; use style::parallel; use style::parser::ParserContextExtraData; -use style::properties::{PropertyDeclarationBlock, parse_one_declaration}; +use style::properties::{ComputedValues, PropertyDeclarationBlock, parse_one_declaration}; use style::selector_impl::{SelectorImplExt, PseudoElementCascadeType}; use style::sequential; -use style::stylesheets::Origin; +use style::stylesheets::{Stylesheet, Origin}; use traversal::RecalcStyleOnly; use url::Url; use wrapper::{DUMMY_BASE_URL, GeckoDocument, GeckoElement, GeckoNode, NonOpaqueStyleData}; diff --git a/ports/geckolib/lib.rs b/ports/geckolib/lib.rs index 0f12ac71525..7f9813597c4 100644 --- a/ports/geckolib/lib.rs +++ b/ports/geckolib/lib.rs @@ -27,10 +27,6 @@ pub mod glue; mod traversal; mod wrapper; -pub use style::gecko_properties as properties; -pub use style::gecko_selector_impl as selector_impl; -pub use style::gecko_values as values; - // FIXME(bholley): This should probably go away once we harmonize the allocators. #[no_mangle] pub extern "C" fn je_malloc_usable_size(_: *const ::libc::c_void) -> ::libc::size_t { 0 } diff --git a/ports/geckolib/traversal.rs b/ports/geckolib/traversal.rs index fc85963ba08..87b63e83e15 100644 --- a/ports/geckolib/traversal.rs +++ b/ports/geckolib/traversal.rs @@ -3,8 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use context::StandaloneStyleContext; -use selector_impl::SharedStyleContext; use std::mem; +use style::context::SharedStyleContext; use style::dom::OpaqueNode; use style::traversal::{DomTraversalContext, recalc_style_at}; use wrapper::GeckoNode; diff --git a/ports/geckolib/wrapper.rs b/ports/geckolib/wrapper.rs index 32215fbfe78..73bfa8adcc3 100644 --- a/ports/geckolib/wrapper.rs +++ b/ports/geckolib/wrapper.rs @@ -27,8 +27,6 @@ use gecko_bindings::structs::nsIAtom; use gecko_bindings::structs::{NODE_HAS_DIRTY_DESCENDANTS_FOR_SERVO, NODE_IS_DIRTY_FOR_SERVO}; use glue::GeckoDeclarationBlock; use libc::uintptr_t; -use properties::ComputedValues; -use selector_impl::{GeckoSelectorImpl, NonTSPseudoClass, PrivateStyleData}; use selectors::Element; use selectors::matching::DeclarationBlock; use selectors::parser::{AttrSelector, NamespaceConstraint}; @@ -38,15 +36,17 @@ use std::ptr; use std::slice; use std::sync::Arc; use string_cache::{Atom, BorrowedAtom, BorrowedNamespace, Namespace}; +use style::data::PrivateStyleData; use style::dom::{OpaqueNode, PresentationalHintsSynthetizer}; use style::dom::{TDocument, TElement, TNode, TRestyleDamage, UnsafeNode}; use style::element_state::ElementState; #[allow(unused_imports)] // Used in commented-out code. use style::error_reporting::StdoutErrorReporter; +use style::gecko_selector_impl::{GeckoSelectorImpl, NonTSPseudoClass}; #[allow(unused_imports)] // Used in commented-out code. use style::parser::ParserContextExtraData; #[allow(unused_imports)] // Used in commented-out code. -use style::properties::parse_style_attribute; +use style::properties::{ComputedValues, parse_style_attribute}; use style::properties::{PropertyDeclaration, PropertyDeclarationBlock}; use style::refcell::{Ref, RefCell, RefMut}; use style::restyle_hints::ElementSnapshot; diff --git a/tests/unit/style/lib.rs b/tests/unit/style/lib.rs index 1437daa999f..74546cb12f0 100644 --- a/tests/unit/style/lib.rs +++ b/tests/unit/style/lib.rs @@ -29,7 +29,7 @@ mod viewport; mod writing_modes { use style::logical_geometry::WritingMode; - use style::properties::{INITIAL_SERVO_VALUES, ComputedValues, get_writing_mode}; + use style::properties::{INITIAL_SERVO_VALUES, get_writing_mode}; #[test] fn initial_writing_mode_is_empty() { diff --git a/tests/unit/style/media_queries.rs b/tests/unit/style/media_queries.rs index c806f4ee8ad..3a52245a818 100644 --- a/tests/unit/style/media_queries.rs +++ b/tests/unit/style/media_queries.rs @@ -9,8 +9,7 @@ use std::borrow::ToOwned; use style::error_reporting::ParseErrorReporter; use style::media_queries::*; use style::parser::ParserContextExtraData; -use style::servo::Stylesheet; -use style::stylesheets::{Origin, CSSRuleIteratorExt}; +use style::stylesheets::{Stylesheet, Origin, CSSRuleIteratorExt}; use style::values::specified; use url::Url; diff --git a/tests/unit/style/stylesheets.rs b/tests/unit/style/stylesheets.rs index dc04712d1a8..b388416d803 100644 --- a/tests/unit/style/stylesheets.rs +++ b/tests/unit/style/stylesheets.rs @@ -13,8 +13,7 @@ use style::error_reporting::ParseErrorReporter; use style::keyframes::{Keyframe, KeyframeSelector, KeyframePercentage}; use style::parser::ParserContextExtraData; use style::properties::{PropertyDeclaration, PropertyDeclarationBlock, DeclaredValue, longhands}; -use style::servo::Stylesheet; -use style::stylesheets::{CSSRule, StyleRule, KeyframesRule, Origin}; +use style::stylesheets::{Stylesheet, CSSRule, StyleRule, KeyframesRule, Origin}; use style::values::specified::{LengthOrPercentageOrAuto, Percentage}; use url::Url; diff --git a/tests/unit/style/viewport.rs b/tests/unit/style/viewport.rs index 2d110e7de39..76da4f51576 100644 --- a/tests/unit/style/viewport.rs +++ b/tests/unit/style/viewport.rs @@ -9,8 +9,7 @@ use media_queries::CSSErrorReporterTest; use style::error_reporting::ParseErrorReporter; use style::media_queries::{Device, MediaType}; use style::parser::{ParserContext, ParserContextExtraData}; -use style::servo::Stylesheet; -use style::stylesheets::{Origin, CSSRuleIteratorExt}; +use style::stylesheets::{Stylesheet, Origin, CSSRuleIteratorExt}; use style::values::specified::Length::{self, ViewportPercentage}; use style::values::specified::LengthOrPercentageOrAuto::{self, Auto}; use style::values::specified::ViewportPercentageLength::Vw; |