diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2015-08-18 19:37:15 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2015-08-21 21:16:25 +0200 |
| commit | 21d69314d4752751f55a250b68a9b7f87368cb92 (patch) | |
| tree | acd6f426a38655d622896fadf3b7d4039f79d2da /components/layout/inline.rs | |
| parent | 649250130b221685dfa8e570ae07d0d2f634bd40 (diff) | |
| download | servo-21d69314d4752751f55a250b68a9b7f87368cb92.tar.gz servo-21d69314d4752751f55a250b68a9b7f87368cb92.zip | |
Don’t mark flow_ref::deref_mut as unsafe.
See discussion in https://github.com/servo/servo/pull/7237
Diffstat (limited to 'components/layout/inline.rs')
| -rw-r--r-- | components/layout/inline.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 966cf5f9bff..4b5a6b985c7 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -1597,7 +1597,6 @@ impl Flow for InlineFlow { self.base.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW); } - #[allow(unsafe_code)] fn compute_absolute_position(&mut self, _: &LayoutContext) { // First, gather up the positions of all the containing blocks (if any). // @@ -1658,7 +1657,7 @@ impl Flow for InlineFlow { let is_positioned = fragment.is_positioned(); match fragment.specific { SpecificFragmentInfo::InlineBlock(ref mut info) => { - let flow = unsafe { flow_ref::deref_mut(&mut info.flow_ref) }; + let flow = flow_ref::deref_mut(&mut info.flow_ref); flow::mut_base(flow).clip = clip; let block_flow = flow.as_mut_block(); @@ -1679,7 +1678,7 @@ impl Flow for InlineFlow { self.base.stacking_relative_position_of_display_port; } SpecificFragmentInfo::InlineAbsoluteHypothetical(ref mut info) => { - let flow = unsafe { flow_ref::deref_mut(&mut info.flow_ref) }; + let flow = flow_ref::deref_mut(&mut info.flow_ref); flow::mut_base(flow).clip = clip; let block_flow = flow.as_mut_block(); block_flow.base.absolute_position_info = self.base.absolute_position_info; @@ -1690,7 +1689,7 @@ impl Flow for InlineFlow { self.base.stacking_relative_position_of_display_port; } SpecificFragmentInfo::InlineAbsolute(ref mut info) => { - let flow = unsafe { flow_ref::deref_mut(&mut info.flow_ref) }; + let flow = flow_ref::deref_mut(&mut info.flow_ref); flow::mut_base(flow).clip = clip; let block_flow = flow.as_mut_block(); |