diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-02 20:01:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 20:01:10 -0500 |
| commit | 7b1006936a27232fb77fef5893cc141e66bb12b7 (patch) | |
| tree | 750a15b93482d99f1aadd7afe507dd910516a6d1 /components/script_layout_interface | |
| parent | 536d63c67028c7368dff780945626283d2c48f1c (diff) | |
| parent | fd1c814e7812e68e1207165c9387ddcfd8a6379b (diff) | |
| download | servo-7b1006936a27232fb77fef5893cc141e66bb12b7.tar.gz servo-7b1006936a27232fb77fef5893cc141e66bb12b7.zip | |
Auto merge of #16702 - bholley:custom_arc, r=emilio
Use a custom arc in the style system
See https://bugzilla.mozilla.org/show_bug.cgi?id=1360889
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16702)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_layout_interface')
| -rw-r--r-- | components/script_layout_interface/message.rs | 4 | ||||
| -rw-r--r-- | components/script_layout_interface/wrapper_traits.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/script_layout_interface/message.rs b/components/script_layout_interface/message.rs index b94b6cd8d14..8b04a131404 100644 --- a/components/script_layout_interface/message.rs +++ b/components/script_layout_interface/message.rs @@ -25,7 +25,7 @@ use style::stylesheets::Stylesheet; /// Asynchronous messages that script can send to layout. pub enum Msg { /// Adds the given stylesheet to the document. - AddStylesheet(Arc<Stylesheet>), + AddStylesheet(::style::stylearc::Arc<Stylesheet>), /// Change the quirks mode. SetQuirksMode(QuirksMode), @@ -116,7 +116,7 @@ pub struct ScriptReflow { /// The document node. pub document: TrustedNodeAddress, /// The document's list of stylesheets. - pub document_stylesheets: Vec<Arc<Stylesheet>>, + pub document_stylesheets: Vec<::style::stylearc::Arc<Stylesheet>>, /// Whether the document's stylesheets have changed since the last script reflow. pub stylesheets_changed: bool, /// The current window size. diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs index 4abc74bcac0..bb7d1e373cf 100644 --- a/components/script_layout_interface/wrapper_traits.rs +++ b/components/script_layout_interface/wrapper_traits.rs @@ -15,7 +15,6 @@ 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)] |