Auto merge of #17248 - cbrewster:fix_the_chrome, r=asajeffrey

Fix parent climb hierarchy in send_frame_tree

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #17246 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17248)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-06-08 18:25:20 -07:00 committed by GitHub
commit 1fe70437cb

View file

@ -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,
}
}