From fd68208da6258a5ec993a6091d8b96dc0ecf3e23 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Tue, 23 Aug 2016 18:06:15 +0200
Subject: [PATCH] Stop creating a LayoutContext in
 build_display_list_for_subtree.

---
 components/layout/sequential.rs | 5 ++---
 components/layout/traversal.rs  | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs
index cbd5954ebee..48a4c3b3889 100644
--- a/components/layout/sequential.rs
+++ b/components/layout/sequential.rs
@@ -82,14 +82,13 @@ pub fn build_display_list_for_subtree(root: &mut FlowRef,
                                       shared_layout_context: &SharedLayoutContext)
                                       -> Vec<DisplayItem> {
     let flow_root = flow_ref::deref_mut(root);
-    let layout_context = LayoutContext::new(shared_layout_context);
-    flow_root.traverse_preorder(&ComputeAbsolutePositions { layout_context: &layout_context });
+    flow_root.traverse_preorder(&ComputeAbsolutePositions { layout_context: shared_layout_context });
     let mut children = vec![];
     flow_root.collect_stacking_contexts(root_stacking_context.id,
                                         &mut children);
     root_stacking_context.add_children(children);
     let mut build_display_list = BuildDisplayList {
-        state: DisplayListBuildState::new(&layout_context.shared,
+        state: DisplayListBuildState::new(shared_layout_context,
                                           flow::base(&*flow_root).stacking_context_id),
     };
     build_display_list.traverse(&mut *flow_root);
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs
index 37d9ed83091..ca35419bc46 100644
--- a/components/layout/traversal.rs
+++ b/components/layout/traversal.rs
@@ -198,13 +198,13 @@ impl<'a> PostorderFlowTraversal for AssignBSizes<'a> {
 
 #[derive(Copy, Clone)]
 pub struct ComputeAbsolutePositions<'a> {
-    pub layout_context: &'a LayoutContext<'a>,
+    pub layout_context: &'a SharedLayoutContext,
 }
 
 impl<'a> PreorderFlowTraversal for ComputeAbsolutePositions<'a> {
     #[inline]
     fn process(&self, flow: &mut Flow) {
-        flow.compute_absolute_position(self.layout_context.shared);
+        flow.compute_absolute_position(self.layout_context);
     }
 }