From 7dc7173a734147295d504530df642dcc8a0e3eb1 Mon Sep 17 00:00:00 2001
From: Jonathan Kingston <jonathan@jooped.co.uk>
Date: Thu, 14 Jun 2018 04:50:18 -0700
Subject: [PATCH] Allow supported window attributes to be replacable.

---
 components/script/dom/webidls/Window.webidl   | 24 ++++++-------
 .../css/cssom-view/window-interface.xht.ini   |  4 +++
 .../window-properties.https.html.ini          | 36 -------------------
 3 files changed, 16 insertions(+), 48 deletions(-)
 create mode 100644 tests/wpt/metadata/css/cssom-view/window-interface.xht.ini

diff --git a/components/script/dom/webidls/Window.webidl b/components/script/dom/webidls/Window.webidl
index 8416cd49334..7fb00fbc05a 100644
--- a/components/script/dom/webidls/Window.webidl
+++ b/components/script/dom/webidls/Window.webidl
@@ -104,7 +104,7 @@ dictionary ScrollToOptions : ScrollOptions {
 // http://dev.w3.org/csswg/cssom-view/#extensions-to-the-window-interface
 partial interface Window {
   [Exposed=(Window), NewObject] MediaQueryList matchMedia(DOMString query);
-  [SameObject] readonly attribute Screen screen;
+  [SameObject, Replaceable] readonly attribute Screen screen;
 
   // browsing context
   void moveTo(long x, long y);
@@ -113,14 +113,14 @@ partial interface Window {
   void resizeBy(long x, long y);
 
   // viewport
-  readonly attribute long innerWidth;
-  readonly attribute long innerHeight;
+  [Replaceable] readonly attribute long innerWidth;
+  [Replaceable] readonly attribute long innerHeight;
 
   // viewport scrolling
-  readonly attribute long scrollX;
-  readonly attribute long pageXOffset;
-  readonly attribute long scrollY;
-  readonly attribute long pageYOffset;
+  [Replaceable] readonly attribute long scrollX;
+  [Replaceable] readonly attribute long pageXOffset;
+  [Replaceable] readonly attribute long scrollY;
+  [Replaceable] readonly attribute long pageYOffset;
   void scroll(optional ScrollToOptions options);
   void scroll(unrestricted double x, unrestricted double y);
   void scrollTo(optional ScrollToOptions options);
@@ -129,11 +129,11 @@ partial interface Window {
   void scrollBy(unrestricted double x, unrestricted double y);
 
   // client
-  readonly attribute long screenX;
-  readonly attribute long screenY;
-  readonly attribute long outerWidth;
-  readonly attribute long outerHeight;
-  readonly attribute double devicePixelRatio;
+  [Replaceable] readonly attribute long screenX;
+  [Replaceable] readonly attribute long screenY;
+  [Replaceable] readonly attribute long outerWidth;
+  [Replaceable] readonly attribute long outerHeight;
+  [Replaceable] readonly attribute double devicePixelRatio;
 };
 
 // Proprietary extensions.
diff --git a/tests/wpt/metadata/css/cssom-view/window-interface.xht.ini b/tests/wpt/metadata/css/cssom-view/window-interface.xht.ini
new file mode 100644
index 00000000000..1f916c2d374
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/window-interface.xht.ini
@@ -0,0 +1,4 @@
+[window-interface.xht]
+  [window_properties_readonly]
+    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 a3d1d406971..27597793aa0 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
@@ -53,39 +53,3 @@
   [Window replaceable attribute: external]
     expected: FAIL
 
-  [Window replaceable attribute: screen]
-    expected: FAIL
-
-  [Window replaceable attribute: scrollX]
-    expected: FAIL
-
-  [Window replaceable attribute: scrollY]
-    expected: FAIL
-
-  [Window replaceable attribute: pageXOffset]
-    expected: FAIL
-
-  [Window replaceable attribute: pageYOffset]
-    expected: FAIL
-
-  [Window replaceable attribute: innerWidth]
-    expected: FAIL
-
-  [Window replaceable attribute: innerHeight]
-    expected: FAIL
-
-  [Window replaceable attribute: screenX]
-    expected: FAIL
-
-  [Window replaceable attribute: screenY]
-    expected: FAIL
-
-  [Window replaceable attribute: outerWidth]
-    expected: FAIL
-
-  [Window replaceable attribute: outerHeight]
-    expected: FAIL
-
-  [Window replaceable attribute: devicePixelRatio]
-    expected: FAIL
-