Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 07:25:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use the Deref traits for FlowRefs.

Browse source 
This patch switches FlowRefs to using the Deref and DerefMut traits, instead of
the custom `get` and `get_mut` functions.
This commit is contained in:
Clark Gaebel 2014-10-15 10:57:25 -07:00
parent afc144aa39
commit 76ed7484eb
10 changed files with 76 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/layout/inline.rs
View file

@ -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
}
_ => {}
}