Auto merge of #17527 - cbrewster:iframe_cycles, r=asajeffrey

Don't return window proxy if it has been discarded

<!-- 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 #17479 (github issue number if applicable).

<!-- Either: -->
- [x] 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/17527)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-06-28 01:59:16 -07:00 committed by GitHub
commit 51dd0c65cd
3 changed files with 11 additions and 16 deletions

View file

@ -1,6 +0,0 @@
[iframe-append-to-child-document.html]
type: testharness
[Append iframe element to its own child document]
bug: https://github.com/servo/servo/issues/17479
expected: FAIL