diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-07 13:27:44 -0500 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-06-07 13:27:44 -0500 |
commit | 280bfc961a013bec58ba23d756db002b3e44fdef (patch) | |
tree | 1bf2fe8fe36edacd891606585259350b59147680 /components/script/dom/document.rs | |
parent | 1e3edf3ca454b91dfdc267c5b2f4347eda9b7cb6 (diff) | |
parent | 0769982ec30fabc45a7a52f83de184d9c6cb596a (diff) | |
download | servo-280bfc961a013bec58ba23d756db002b3e44fdef.tar.gz servo-280bfc961a013bec58ba23d756db002b3e44fdef.zip |
Auto merge of #11644 - asajeffrey:mozbrowser-top-level-browsing-context, r=ConnerGBrewster
Mozbrowser top level browsing context
<!-- Please describe your changes on the following line: -->
Got `window.top` and `window.parent` to return the right result inside a `mozbrowser` iframe.
---
<!-- 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] There are tests for these changes
<!-- 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="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11644)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/document.rs')
-rw-r--r-- | components/script/dom/document.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index a3a9d4beeaa..2a7466dc2eb 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -1260,7 +1260,7 @@ impl Document { pub fn trigger_mozbrowser_event(&self, event: MozBrowserEvent) { if mozbrowser_enabled() { - if let Some((containing_pipeline_id, subpage_id)) = self.window.parent_info() { + if let Some((containing_pipeline_id, subpage_id, _)) = self.window.parent_info() { let event = ConstellationMsg::MozBrowserEvent(containing_pipeline_id, subpage_id, event); |