aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory Terzian <gterzian@users.noreply.github.com>2018-03-31 23:07:03 +0800
committerGregory Terzian <gterzian@users.noreply.github.com>2018-05-04 15:15:12 +0800
commita1d1b187102b340ba65955f2c4f1131c8276d050 (patch)
tree6a3d919dae4028f0acae60b89cda6e9d93361b10
parenta5a120f30ae412a110ac9f2a7528ec6eff06329c (diff)
downloadservo-a1d1b187102b340ba65955f2c4f1131c8276d050.tar.gz
servo-a1d1b187102b340ba65955f2c4f1131c8276d050.zip
PutForward=href on window and document location
-rw-r--r--components/script/dom/webidls/Document.webidl2
-rw-r--r--components/script/dom/webidls/Window.webidl2
-rw-r--r--tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini16
-rw-r--r--tests/wpt/metadata/html/browsers/the-window-object/window-properties.https.html.ini3
4 files changed, 2 insertions, 21 deletions
diff --git a/components/script/dom/webidls/Document.webidl b/components/script/dom/webidls/Document.webidl
index fbb4787ab89..9212bb4b99b 100644
--- a/components/script/dom/webidls/Document.webidl
+++ b/components/script/dom/webidls/Document.webidl
@@ -83,7 +83,7 @@ dictionary ElementCreationOptions {
// [OverrideBuiltins]
partial /*sealed*/ interface Document {
// resource metadata management
- [/*PutForwards=href, */Unforgeable]
+ [PutForwards=href, Unforgeable]
readonly attribute Location? location;
[SetterThrows] attribute DOMString domain;
readonly attribute DOMString referrer;
diff --git a/components/script/dom/webidls/Window.webidl b/components/script/dom/webidls/Window.webidl
index 034684c1744..37bba020622 100644
--- a/components/script/dom/webidls/Window.webidl
+++ b/components/script/dom/webidls/Window.webidl
@@ -12,7 +12,7 @@
attribute DOMString name;
- [/*PutForwards=href, */Unforgeable] readonly attribute Location location;
+ [PutForwards=href, Unforgeable] readonly attribute Location location;
readonly attribute History history;
[Pref="dom.customelements.enabled"]
readonly attribute CustomElementRegistry customElements;
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index 3f58364cf0f..fc20af26ee0 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -17,19 +17,3 @@
[Set data URL frame location.protocol to http+x]
expected: FAIL
-
- [Set HTTP URL frame location.protocol to x]
- expected: FAIL
-
- [Set HTTP URL frame location.protocol to data]
- expected: FAIL
-
- [Set HTTP URL frame location.protocol to ftp]
- expected: FAIL
-
- [Set HTTP URL frame location.protocol to gopher]
- expected: FAIL
-
- [Set HTTP URL frame location.protocol to http+x]
- expected: FAIL
-
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 f93db63cd5b..f0c77110ca6 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
@@ -32,9 +32,6 @@
[Window attribute: onmousewheel]
expected: FAIL
- [Window unforgeable attribute: location]
- expected: FAIL
-
[Window replaceable attribute: locationbar]
expected: FAIL