diff options
| author | Christian Poveda <z1mvader@protonmail.com> | 2017-05-03 12:57:49 -0500 |
|---|---|---|
| committer | Christian Poveda <z1mvader@protonmail.com> | 2017-05-03 12:57:49 -0500 |
| commit | 62821a69153441f36b8ff10050a29502dea71037 (patch) | |
| tree | bb1560f8965520a1bded497d81c18f1dabfe57e8 /components/script_layout_interface/wrapper_traits.rs | |
| parent | 875e422fe67f68bdf57bd3635279e224b0c90996 (diff) | |
| parent | 3905b5af1804ad912c6e1854a0bcdfe9bda79065 (diff) | |
| download | servo-62821a69153441f36b8ff10050a29502dea71037.tar.gz servo-62821a69153441f36b8ff10050a29502dea71037.zip | |
Solving merge conficts related to the html5ever_atoms -> html5ever change
Diffstat (limited to 'components/script_layout_interface/wrapper_traits.rs')
| -rw-r--r-- | components/script_layout_interface/wrapper_traits.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs index 4abc74bcac0..e39d27614c5 100644 --- a/components/script_layout_interface/wrapper_traits.rs +++ b/components/script_layout_interface/wrapper_traits.rs @@ -10,12 +10,11 @@ use OpaqueStyleAndLayoutData; use SVGSVGData; use atomic_refcell::AtomicRefCell; use gfx_traits::{ByteIndex, FragmentType, combine_id_with_fragment_type}; -use html5ever_atoms::{Namespace, LocalName}; +use html5ever::{Namespace, LocalName}; use msg::constellation_msg::PipelineId; use range::Range; use servo_url::ServoUrl; use std::fmt::Debug; -use std::sync::Arc; use style::computed_values::display; use style::context::SharedStyleContext; use style::data::ElementData; @@ -24,6 +23,7 @@ use style::dom::OpaqueNode; use style::font_metrics::ServoMetricsProvider; use style::properties::{CascadeFlags, ServoComputedValues}; use style::selector_parser::{PseudoElement, PseudoElementCascadeType, SelectorImpl}; +use style::stylearc::Arc; use webrender_traits::ClipId; #[derive(Copy, PartialEq, Clone, Debug)] |