diff options
author | Connor Brewster <connor.brewster@eagles.oc.edu> | 2017-06-08 19:17:51 -0600 |
---|---|---|
committer | Connor Brewster <connor.brewster@eagles.oc.edu> | 2017-06-08 19:19:50 -0600 |
commit | fc0854c4e2ace75f9e7bc89e0216dfb18cabb832 (patch) | |
tree | c1b3688887711cf904e60d82609b619f2555d1b7 | |
parent | 310408a82851d05db3b310ac5b9cdf49a33e1990 (diff) | |
download | servo-fc0854c4e2ace75f9e7bc89e0216dfb18cabb832.tar.gz servo-fc0854c4e2ace75f9e7bc89e0216dfb18cabb832.zip |
Properly climb parent hierarchy in send_frame_tree
-rw-r--r-- | components/constellation/constellation.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs index eb1bb4c9476..ddc7cbd432a 100644 --- a/components/constellation/constellation.rs +++ b/components/constellation/constellation.rs @@ -786,6 +786,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> top_level_id: TopLevelBrowsingContextId, pipeline_id: PipelineId, load_data: LoadData) { + debug!("Creating new browsing context {}", browsing_context_id); let browsing_context = BrowsingContext::new(browsing_context_id, top_level_id, pipeline_id, load_data); self.browsing_contexts.insert(browsing_context_id, browsing_context); @@ -2857,11 +2858,11 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF> while let Some(pipeline) = self.pipelines.get(&pipeline_id) { match pipeline.parent_info { - Some((parent_id, _)) => { + Some((parent_id, _)) => pipeline_id = parent_id, + None => { browsing_context_id = pipeline.browsing_context_id; - pipeline_id = parent_id; + break; }, - None => break, } } |