diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2017-03-18 02:10:00 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2017-03-19 22:30:38 +0100 |
commit | 1bacd0eb1582f609ad9a9c9a8a33a737bf4bc6f3 (patch) | |
tree | a92f2a919f30d6db9f8542403dc1c04bee42c63a /components/script/layout_wrapper.rs | |
parent | aeffca2a5900ebcf91063e9c7771b642817cb6bd (diff) | |
download | servo-1bacd0eb1582f609ad9a9c9a8a33a737bf4bc6f3.tar.gz servo-1bacd0eb1582f609ad9a9c9a8a33a737bf4bc6f3.zip |
Move all PropertyDeclarationBlock from RwLock<_> to Locked<_>
Diffstat (limited to 'components/script/layout_wrapper.rs')
-rw-r--r-- | components/script/layout_wrapper.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index 5a9a834667b..36aa7601d0b 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -44,7 +44,6 @@ use dom::text::Text; use gfx_traits::ByteIndex; use html5ever_atoms::{LocalName, Namespace}; use msg::constellation_msg::PipelineId; -use parking_lot::RwLock; use range::Range; use script_layout_interface::{HTMLCanvasData, LayoutNodeType, SVGSVGData, TrustedNodeAddress}; use script_layout_interface::{OpaqueStyleAndLayoutData, PartialPersistentLayoutData}; @@ -69,7 +68,7 @@ use style::dom::UnsafeNode; use style::element_state::*; use style::properties::{ComputedValues, PropertyDeclarationBlock}; use style::selector_parser::{NonTSPseudoClass, PseudoElement, SelectorImpl}; -use style::shared_lock::SharedRwLock as StyleSharedRwLock; +use style::shared_lock::{SharedRwLock as StyleSharedRwLock, Locked as StyleLocked}; use style::sink::Push; use style::str::is_whitespace; use style::stylist::ApplicableDeclarationBlock; @@ -377,7 +376,7 @@ impl<'le> TElement for ServoLayoutElement<'le> { ServoLayoutNode::from_layout_js(self.element.upcast()) } - fn style_attribute(&self) -> Option<&Arc<RwLock<PropertyDeclarationBlock>>> { + fn style_attribute(&self) -> Option<&Arc<StyleLocked<PropertyDeclarationBlock>>> { unsafe { (*self.element.style_attribute()).as_ref() } |