aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/sequential.rs
diff options
context:
space:
mode:
authorMs2ger <Ms2ger@gmail.com>2016-08-24 10:36:56 +0200
committerMs2ger <Ms2ger@gmail.com>2016-08-25 09:21:36 +0200
commitc1d953cd2e9fa605958f1d3e40e9163fff5b18da (patch)
tree5b46b2dc0242cc61bf0f6aa01974734d7e9d8a25 /components/layout/sequential.rs
parentfa0e198c8f034ebb9a7cdca618f6ec3c4e193520 (diff)
downloadservo-c1d953cd2e9fa605958f1d3e40e9163fff5b18da.tar.gz
servo-c1d953cd2e9fa605958f1d3e40e9163fff5b18da.zip
Pass a &mut Flow to build_display_list_for_subtree.
Diffstat (limited to 'components/layout/sequential.rs')
-rw-r--r--components/layout/sequential.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs
index 5fca977b8b1..f75768fefe9 100644
--- a/components/layout/sequential.rs
+++ b/components/layout/sequential.rs
@@ -12,7 +12,6 @@ use floats::SpeculatedFloatPlacement;
use flow::IS_ABSOLUTELY_POSITIONED;
use flow::{PostorderFlowTraversal, PreorderFlowTraversal};
use flow::{self, Flow, ImmutableFlowUtils, InorderFlowTraversal, MutableFlowUtils};
-use flow_ref::{self, FlowRef};
use fragment::FragmentBorderBoxIterator;
use generated_content::ResolveGeneratedContent;
use gfx::display_list::{DisplayItem, StackingContext};
@@ -75,11 +74,10 @@ pub fn traverse_flow_tree_preorder(root: &mut Flow,
doit(root, assign_inline_sizes, assign_block_sizes);
}
-pub fn build_display_list_for_subtree(root: &mut FlowRef,
+pub fn build_display_list_for_subtree(flow_root: &mut Flow,
root_stacking_context: &mut StackingContext,
shared_layout_context: &SharedLayoutContext)
-> Vec<DisplayItem> {
- let flow_root = flow_ref::deref_mut(root);
flow_root.traverse_preorder(&ComputeAbsolutePositions { layout_context: shared_layout_context });
let mut children = vec![];
flow_root.collect_stacking_contexts(root_stacking_context.id,
@@ -87,9 +85,9 @@ pub fn build_display_list_for_subtree(root: &mut FlowRef,
root_stacking_context.add_children(children);
let mut build_display_list = BuildDisplayList {
state: DisplayListBuildState::new(shared_layout_context,
- flow::base(&*flow_root).stacking_context_id),
+ flow::base(flow_root).stacking_context_id),
};
- build_display_list.traverse(&mut *flow_root);
+ build_display_list.traverse(flow_root);
build_display_list.state.items
}