diff options
author | Bobby Holley <bobbyholley@gmail.com> | 2016-09-29 17:09:06 -0700 |
---|---|---|
committer | Bobby Holley <bobbyholley@gmail.com> | 2016-10-02 19:19:52 -0700 |
commit | 687e1f701c5b466ed908b2f05243e0ea299d3c9b (patch) | |
tree | 3dab40fe7d8c478e212ab38329bcd75d003faedf /components/layout/construct.rs | |
parent | 5bcc4192bf2c0723444ee62b8fbbbc2084d53175 (diff) | |
download | servo-687e1f701c5b466ed908b2f05243e0ea299d3c9b.tar.gz servo-687e1f701c5b466ed908b2f05243e0ea299d3c9b.zip |
Rename PrivateStyleData to PersistentStyleData and use AtomicRefCell instead of RefCell as a container.
This allows us to eliminate the unsafe borrows. \o/
MozReview-Commit-ID: 29hpGaWUFQz
Diffstat (limited to 'components/layout/construct.rs')
-rw-r--r-- | components/layout/construct.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 225456956df..8a463ded66a 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -16,7 +16,7 @@ use app_units::Au; use block::BlockFlow; use context::LayoutContext; -use data::{HAS_NEWLY_CONSTRUCTED_FLOW, PrivateLayoutData}; +use data::{HAS_NEWLY_CONSTRUCTED_FLOW, PersistentLayoutData}; use flex::FlexFlow; use floats::FloatKind; use flow::{self, AbsoluteDescendants, IS_ABSOLUTELY_POSITIONED, ImmutableFlowUtils}; @@ -1679,7 +1679,7 @@ trait NodeUtils { /// Returns true if this node doesn't render its kids and false otherwise. fn is_replaced_content(&self) -> bool; - fn construction_result_mut(self, layout_data: &mut PrivateLayoutData) -> &mut ConstructionResult; + fn construction_result_mut(self, layout_data: &mut PersistentLayoutData) -> &mut ConstructionResult; /// Sets the construction result of a flow. fn set_flow_construction_result(self, result: ConstructionResult); @@ -1708,7 +1708,7 @@ impl<ConcreteThreadSafeLayoutNode> NodeUtils for ConcreteThreadSafeLayoutNode } } - fn construction_result_mut(self, data: &mut PrivateLayoutData) -> &mut ConstructionResult { + fn construction_result_mut(self, data: &mut PersistentLayoutData) -> &mut ConstructionResult { match self.get_pseudo_element_type() { PseudoElementType::Before(_) => &mut data.before_flow_construction_result, PseudoElementType::After (_) => &mut data.after_flow_construction_result, |