From c693e13a2c17d4a73d4ba8201fe638124bd821f2 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 9 Jul 2015 13:12:12 +0200
Subject: [PATCH] Remove the reflow root from SharedLayoutContext.

---
 components/layout/context.rs     | 3 ---
 components/layout/layout_task.rs | 7 -------
 2 files changed, 10 deletions(-)

diff --git a/components/layout/context.rs b/components/layout/context.rs
index e68ce343940..4f2cf89de2e 100644
--- a/components/layout/context.rs
+++ b/components/layout/context.rs
@@ -102,9 +102,6 @@ pub struct SharedLayoutContext {
     /// FIXME(#2604): Make this no longer an unsafe pointer once we have fast `RWArc`s.
     pub stylist: *const Stylist,
 
-    /// The root node at which we're starting the layout.
-    pub reflow_root: Option<OpaqueNode>,
-
     /// The URL.
     pub url: Url,
 
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 9c3a3e7ea4c..b1be3bab233 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -441,7 +441,6 @@ impl LayoutTask {
     fn build_shared_layout_context(&self,
                                    rw_data: &LayoutTaskData,
                                    screen_size_changed: bool,
-                                   reflow_root: Option<&LayoutNode>,
                                    url: &Url,
                                    goal: ReflowGoal)
                                    -> SharedLayoutContext {
@@ -456,7 +455,6 @@ impl LayoutTask {
             canvas_layers_sender: self.canvas_layers_sender.clone(),
             stylist: &*rw_data.stylist,
             url: (*url).clone(),
-            reflow_root: reflow_root.map(|node| node.opaque()),
             visible_rects: rw_data.visible_rects.clone(),
             generation: rw_data.generation,
             new_animations_sender: rw_data.new_animations_sender.clone(),
@@ -557,7 +555,6 @@ impl LayoutTask {
 
         let mut layout_context = self.build_shared_layout_context(&*rw_data,
                                                                   false,
-                                                                  None,
                                                                   &self.url,
                                                                   reflow_info.goal);
 
@@ -1188,7 +1185,6 @@ impl LayoutTask {
         // Create a layout context for use throughout the following passes.
         let mut shared_layout_context = self.build_shared_layout_context(&*rw_data,
                                                                          screen_size_changed,
-                                                                         Some(&node),
                                                                          &self.url,
                                                                          data.reflow_info.goal);
 
@@ -1300,7 +1296,6 @@ impl LayoutTask {
 
         let mut layout_context = self.build_shared_layout_context(&*rw_data,
                                                                   false,
-                                                                  None,
                                                                   &self.url,
                                                                   reflow_info.goal);
 
@@ -1323,7 +1318,6 @@ impl LayoutTask {
 
         let mut layout_context = self.build_shared_layout_context(&*rw_data,
                                                                   false,
-                                                                  None,
                                                                   &self.url,
                                                                   reflow_info.goal);
 
@@ -1357,7 +1351,6 @@ impl LayoutTask {
 
         let mut layout_context = self.build_shared_layout_context(&*rw_data,
                                                                   false,
-                                                                  None,
                                                                   &self.url,
                                                                   reflow_info.goal);