From fc0854c4e2ace75f9e7bc89e0216dfb18cabb832 Mon Sep 17 00:00:00 2001
From: Connor Brewster <connor.brewster@eagles.oc.edu>
Date: Thu, 8 Jun 2017 19:17:51 -0600
Subject: [PATCH] Properly climb parent hierarchy in send_frame_tree

---
 components/constellation/constellation.rs | 7 ++++---
 1 file 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,
             }
         }