aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-06-14 04:07:51 -0400
committerGitHub <noreply@github.com>2018-06-14 04:07:51 -0400
commitd6edd5b4381168d76e7a58c3991c8896eba74eb2 (patch)
treed47d52c1707b56246f23d785c49ac1cf6f277516
parent61cf3460a41dfa2143cff1da18c63a5f7a50df3e (diff)
parent51db660175b118c334aefe1c4ccb8c9971b2f07d (diff)
downloadservo-d6edd5b4381168d76e7a58c3991c8896eba74eb2.tar.gz
servo-d6edd5b4381168d76e7a58c3991c8896eba74eb2.zip
Auto merge of #21045 - jonathanKingston:make-parent-replaceable, r=jdm
Allow window.parent attribute to be replaceable by JavaScript. Permit JS to override the window.parent attribute. --- <!-- 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 #20932 (github issue number if applicable). - [x] There are tests for these changes OR <!-- 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/21045) <!-- Reviewable:end -->
-rw-r--r--components/script/dom/webidls/Window.webidl2
-rw-r--r--tests/wpt/metadata/html/browsers/the-window-object/window-properties.https.html.ini3
2 files changed, 1 insertions, 4 deletions
diff --git a/components/script/dom/webidls/Window.webidl b/components/script/dom/webidls/Window.webidl
index 37bba020622..0cda7d2d800 100644
--- a/components/script/dom/webidls/Window.webidl
+++ b/components/script/dom/webidls/Window.webidl
@@ -38,7 +38,7 @@
// attribute any opener;
// Note that this can return null in the case that the browsing context has been discarded.
// https://github.com/whatwg/html/issues/2115
- readonly attribute WindowProxy? parent;
+ [Replaceable] readonly attribute WindowProxy? parent;
readonly attribute Element? frameElement;
//WindowProxy open(optional DOMString url = "about:blank", optional DOMString target = "_blank",
// optional DOMString features = "", optional boolean replace = false);
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/window-properties.https.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/window-properties.https.html.ini
index f0c77110ca6..69a79de6c40 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/window-properties.https.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/window-properties.https.html.ini
@@ -50,9 +50,6 @@
[Window replaceable attribute: toolbar]
expected: FAIL
- [Window replaceable attribute: parent]
- expected: FAIL
-
[Window replaceable attribute: external]
expected: FAIL