diff options
Diffstat (limited to 'components/script_layout_interface')
4 files changed, 4 insertions, 5 deletions
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/restyle_damage.rs b/components/script_layout_interface/restyle_damage.rs index 56a068a2237..c1005099442 100644 --- a/components/script_layout_interface/restyle_damage.rs +++ b/components/script_layout_interface/restyle_damage.rs @@ -6,7 +6,7 @@ use std::fmt; use std::sync::Arc; use style::computed_values::display; use style::dom::TRestyleDamage; -use style::properties::{ComputedValues, ServoComputedValues}; +use style::properties::ServoComputedValues; bitflags! { #[doc = "Individual layout actions that may be necessary after restyling."] @@ -44,7 +44,6 @@ bitflags! { } impl TRestyleDamage for RestyleDamage { - type ConcreteComputedValues = ServoComputedValues; fn compute(old: Option<&Arc<ServoComputedValues>>, new: &ServoComputedValues) -> RestyleDamage { compute_damage(old, new) } 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)] |