auto merge of #3706 : cgaebel/servo/fix-image-dynamic-remove, r=pcwalton

This also adds some extra debugging infrastructure which I found useful tracking
this bug down. A regression in the br reftests is also uncovered by this patch,
which I'll work on fixing next.

EDIT: nevermind. no regression, I just tested that before a rebase.

r? @pcwalton

1 files changed, 5 insertions, 0 deletions

diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index c36ad0433f6..60b2a53938a 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -159,6 +159,7 @@ impl ImageResponder<UntrustedNodeAddress> for LayoutImageResponder {
         let f: proc(ImageResponseMsg, UntrustedNodeAddress):Send =
             proc(_, node_address) {
                 let ScriptControlChan(chan) = script_chan;
+                debug!("Dirtying {:x}", node_address as uint);
                 let mut nodes = SmallVec1::new();
                 nodes.vec_push(node_address);
                 drop(chan.send_opt(SendEventMsg(id.clone(), ReflowEvent(nodes))))
@@ -675,6 +676,10 @@ impl LayoutTask {
             }
         });
 
+        if self.opts.dump_flow_tree {
+            layout_root.dump();
+        }
+
         // Build the display list if necessary, and send it to the renderer.
         if data.goal == ReflowForDisplay {
             let writing_mode = flow::base(layout_root.deref()).writing_mode;