diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-10-15 16:18:23 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-10-15 16:18:23 -0600 |
| commit | 6a11ee89de82abae9d6607a6c2890692df5259eb (patch) | |
| tree | 4ec691fa40395e18779a037733e9a5d3ad55efd1 /components/layout/inline.rs | |
| parent | afc144aa3974db099ec1e66fc974d8e5ef25f74c (diff) | |
| parent | 76ed7484eb35d72d62c7cddc5375aed394536066 (diff) | |
| download | servo-6a11ee89de82abae9d6607a6c2890692df5259eb.tar.gz servo-6a11ee89de82abae9d6607a6c2890692df5259eb.zip | |
auto merge of #3686 : cgaebel/servo/deref-flows, r=pcwalton
This patch switches FlowRefs to using the Deref and DerefMut traits, instead of
the custom `get` and `get_mut` functions.
Diffstat (limited to 'components/layout/inline.rs')
| -rw-r--r-- | components/layout/inline.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 26956155015..1e7e202689c 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -710,7 +710,7 @@ impl InlineFlow { &self.base.clip_rect); match fragment.specific { InlineBlockFragment(ref mut block_flow) => { - let block_flow = block_flow.flow_ref.get_mut(); + let block_flow = block_flow.flow_ref.deref_mut(); self.base.display_list.push_all_move( mem::replace(&mut flow::mut_base(block_flow).display_list, DisplayList::new())); @@ -1117,7 +1117,7 @@ impl Flow for InlineFlow { for fragment in self.fragments.fragments.iter_mut() { let absolute_position = match fragment.specific { InlineBlockFragment(ref mut info) => { - let block_flow = info.flow_ref.get_mut().as_block(); + let block_flow = info.flow_ref.as_block(); // FIXME(#2795): Get the real container size let container_size = Size2D::zero(); @@ -1128,7 +1128,7 @@ impl Flow for InlineFlow { block_flow.base.abs_position } InlineAbsoluteHypotheticalFragment(ref mut info) => { - let block_flow = info.flow_ref.get_mut().as_block(); + let block_flow = info.flow_ref.as_block(); // FIXME(#2795): Get the real container size let container_size = Size2D::zero(); block_flow.base.abs_position = @@ -1146,10 +1146,10 @@ impl Flow for InlineFlow { match fragment.specific { InlineBlockFragment(ref mut info) => { - flow::mut_base(info.flow_ref.get_mut()).clip_rect = clip_rect + flow::mut_base(info.flow_ref.deref_mut()).clip_rect = clip_rect } InlineAbsoluteHypotheticalFragment(ref mut info) => { - flow::mut_base(info.flow_ref.get_mut()).clip_rect = clip_rect + flow::mut_base(info.flow_ref.deref_mut()).clip_rect = clip_rect } _ => {} } |