diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-01-03 19:20:59 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-03 19:20:59 -0800 |
commit | 1e927ca88bf6622d5a87db75863f76976a1df56c (patch) | |
tree | 22f2bb7edba60697ec4d6dbfe5bf3a75cfc48029 /components/layout | |
parent | 220e6e40142141c8c857da53aafc607923930194 (diff) | |
parent | b9d99390ad4e3f0fc0efa642fa260ca2ed1f7303 (diff) | |
download | servo-1e927ca88bf6622d5a87db75863f76976a1df56c.tar.gz servo-1e927ca88bf6622d5a87db75863f76976a1df56c.zip |
Auto merge of #14835 - bholley:external_atomic_refcell, r=Manishearth
Switch to crates.io for atomic_refcell
r? @Manishearth
See #14828 for backstory.
<!-- 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/14835)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout')
-rw-r--r-- | components/layout/Cargo.toml | 1 | ||||
-rw-r--r-- | components/layout/lib.rs | 1 | ||||
-rw-r--r-- | components/layout/traversal.rs | 2 | ||||
-rw-r--r-- | components/layout/wrapper.rs | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index d3da21bf1a6..2d896fb5eae 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -11,6 +11,7 @@ path = "lib.rs" [dependencies] app_units = "0.3" +atomic_refcell = "0.1" bitflags = "0.7" canvas_traits = {path = "../canvas_traits"} cssparser = {version = "0.7", features = ["heap_size", "serde-serialization"]} diff --git a/components/layout/lib.rs b/components/layout/lib.rs index b2aaa006a2a..e71616dafed 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -16,6 +16,7 @@ #![plugin(plugins)] extern crate app_units; +extern crate atomic_refcell; #[allow(unused_extern_crates)] #[macro_use] extern crate bitflags; diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index b3672ecf32c..a1109b51443 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -4,6 +4,7 @@ //! Traversals over the DOM and flow trees, running the layout computations. +use atomic_refcell::AtomicRefCell; use construct::FlowConstructor; use context::{LayoutContext, ScopedThreadLocalLayoutContext, SharedLayoutContext}; use display_list_builder::DisplayListBuildState; @@ -11,7 +12,6 @@ use flow::{self, PreorderFlowTraversal}; use flow::{CAN_BE_FRAGMENTED, Flow, ImmutableFlowUtils, PostorderFlowTraversal}; use script_layout_interface::wrapper_traits::{LayoutNode, ThreadSafeLayoutNode}; use servo_config::opts; -use style::atomic_refcell::AtomicRefCell; use style::context::{SharedStyleContext, StyleContext}; use style::data::ElementData; use style::dom::{TElement, TNode}; diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs index 32f24558ec0..d4910c40f87 100644 --- a/components/layout/wrapper.rs +++ b/components/layout/wrapper.rs @@ -30,12 +30,12 @@ #![allow(unsafe_code)] +use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut}; use core::nonzero::NonZero; use data::{LayoutDataFlags, PersistentLayoutData}; use script_layout_interface::{OpaqueStyleAndLayoutData, PartialPersistentLayoutData}; use script_layout_interface::wrapper_traits::{LayoutNode, ThreadSafeLayoutElement, ThreadSafeLayoutNode}; use script_layout_interface::wrapper_traits::GetLayoutData; -use style::atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut}; use style::computed_values::content::{self, ContentItem}; pub type NonOpaqueStyleAndLayoutData = AtomicRefCell<PersistentLayoutData>; |