diff options
Diffstat (limited to 'components/shared/script_layout')
-rw-r--r-- | components/shared/script_layout/lib.rs | 10 | ||||
-rw-r--r-- | components/shared/script_layout/wrapper_traits.rs | 7 |
2 files changed, 7 insertions, 10 deletions
diff --git a/components/shared/script_layout/lib.rs b/components/shared/script_layout/lib.rs index c9ff5c7c47c..de70ae64df0 100644 --- a/components/shared/script_layout/lib.rs +++ b/components/shared/script_layout/lib.rs @@ -12,17 +12,17 @@ pub mod wrapper_traits; use std::any::Any; use std::borrow::Cow; -use std::sync::atomic::{AtomicIsize, AtomicU64, Ordering}; use std::sync::Arc; +use std::sync::atomic::{AtomicIsize, AtomicU64, Ordering}; use app_units::Au; use atomic_refcell::AtomicRefCell; +use base::Epoch; use base::cross_process_instant::CrossProcessInstant; use base::id::{BrowsingContextId, PipelineId, WebViewId}; -use base::Epoch; use canvas_traits::canvas::{CanvasId, CanvasMsg}; -use euclid::default::{Point2D, Rect}; use euclid::Size2D; +use euclid::default::{Point2D, Rect}; use fnv::FnvHashMap; use fonts::{FontContext, SystemFontServiceProxy}; use ipc_channel::ipc::IpcSender; @@ -39,18 +39,18 @@ use script_traits::{ use serde::{Deserialize, Serialize}; use servo_arc::Arc as ServoArc; use servo_url::{ImmutableOrigin, ServoUrl}; +use style::Atom; use style::animation::DocumentAnimationSet; use style::context::QuirksMode; use style::data::ElementData; use style::dom::OpaqueNode; use style::invalidation::element::restyle_hints::RestyleHint; use style::media_queries::Device; -use style::properties::style_structs::Font; use style::properties::PropertyId; +use style::properties::style_structs::Font; use style::queries::values::PrefersColorScheme; use style::selector_parser::{PseudoElement, RestyleDamage, Snapshot}; use style::stylesheets::Stylesheet; -use style::Atom; use style_traits::CSSPixel; use webrender_api::ImageKey; use webrender_traits::CrossProcessCompositorApi; diff --git a/components/shared/script_layout/wrapper_traits.rs b/components/shared/script_layout/wrapper_traits.rs index 5c8da0315b4..bc7939d8870 100644 --- a/components/shared/script_layout/wrapper_traits.rs +++ b/components/shared/script_layout/wrapper_traits.rs @@ -11,7 +11,7 @@ use std::sync::Arc as StdArc; use atomic_refcell::AtomicRef; use base::id::{BrowsingContextId, PipelineId}; use fonts_traits::ByteIndex; -use html5ever::{local_name, namespace_url, ns, LocalName, Namespace}; +use html5ever::{LocalName, Namespace, local_name, namespace_url, ns}; use pixels::{Image, ImageMetadata}; use range::Range; use servo_arc::Arc; @@ -323,10 +323,7 @@ pub trait ThreadSafeLayoutNode<'dom>: Clone + Copy + Debug + NodeInfo + PartialE pub trait ThreadSafeLayoutElement<'dom>: Clone + Copy + Sized + Debug + ::selectors::Element<Impl = SelectorImpl> { - type ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode< - 'dom, - ConcreteThreadSafeLayoutElement = Self, - >; + type ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode<'dom, ConcreteThreadSafeLayoutElement = Self>; /// This type alias is just a work-around to avoid writing /// |