auto merge of #3719 : mrobinson/servo/flow-dump, r=pcwalton

The flow tree is currently dumped for debugging purposes early on in
the flow process, so many values are still zero. If we wait to dump it
until later, the output will more accurately reflect the real flow tree.

1 files changed, 4 insertions, 3 deletions

diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 60b2a53938a..48df4f9c460 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -655,9 +655,6 @@ impl LayoutTask {
         if self.opts.trace_layout {
             layout_debug::begin_trace(layout_root.clone());
         }
-        if self.opts.dump_flow_tree {
-            layout_root.dump();
-        }
 
         // Perform the primary layout passes over the flow tree to compute the locations of all
         // the boxes.
@@ -779,6 +776,10 @@ impl LayoutTask {
             layout_debug::end_trace();
         }
 
+        if self.opts.dump_flow_tree {
+            layout_root.dump();
+        }
+
         rw_data.generation += 1;
 
         // Tell script that we're done.