web-platform-tests · jgraham · Dec 18, 2017 · Dec 6, 2017
diff --git a/FileAPI/idlharness.html b/FileAPI/idlharness.html
@@ -30,8 +30,6 @@ <h1>File API automated IDL tests</h1>
     request.onload = function() {
         var idls = request.responseText;
 
-        idl_array.add_untested_idls("[PrimaryGlobal] interface Window { };");
-
         idl_array.add_untested_idls("[Exposed=(Window,Worker)] interface ArrayBuffer {};");
         idl_array.add_untested_idls("interface URL {};");
         idl_array.add_untested_idls("[Exposed=(Window,Worker)] interface EventTarget {};");

diff --git a/IndexedDB/interfaces.html b/IndexedDB/interfaces.html
@@ -20,7 +20,7 @@ <h1>IndexedDB IDL tests</h1>
     var idls = request.responseText;
 
     // https://html.spec.whatwg.org/multipage/browsers.html#window
-    idlArray.add_untested_idls("[PrimaryGlobal] interface Window { };");
+    idlArray.add_untested_idls("[Global=Window, Exposed=Window] interface Window { };");
 
     // https://html.spec.whatwg.org/multipage/webappapis.html#windoworworkerglobalscope-mixin
     idlArray.add_untested_idls(`[NoInterfaceObject, Exposed=(Window,Worker)]

diff --git a/WebCryptoAPI/idlharness.html b/WebCryptoAPI/idlharness.html
@@ -29,11 +29,6 @@ <h1 class="instructions">Description</h1>
     request.onload = function() {
         var idls = request.responseText;
 
-        idl_array.add_untested_idls("[PrimaryGlobal] interface Window { };");
-
-        idl_array.add_untested_idls("interface ArrayBuffer {};");
-        idl_array.add_untested_idls("interface ArrayBufferView {};");
-
         idl_array.add_idls(idls);
 
         idl_array.add_objects({"Crypto":["crypto"], "SubtleCrypto":["crypto.subtle"]});

diff --git a/WebCryptoAPI/idlharness.https.html b/WebCryptoAPI/idlharness.https.html
@@ -29,11 +29,6 @@ <h1 class="instructions">Description</h1>
     request.onload = function() {
         var idls = request.responseText;
 
-        idl_array.add_untested_idls("[PrimaryGlobal] interface Window { };");
-
-        idl_array.add_untested_idls("interface ArrayBuffer {};");
-        idl_array.add_untested_idls("interface ArrayBufferView {};");
-
         idl_array.add_idls(idls);
 
         idl_array.add_objects({"Crypto":["crypto"], "SubtleCrypto":["crypto.subtle"]});

diff --git a/encrypted-media/idlharness.https.html b/encrypted-media/idlharness.https.html
@@ -30,9 +30,7 @@ <h1 class="instructions">Description</h1>
             .then( function( idls ) {
 
                 var idl_array = new IdlArray();
-                idl_array.add_untested_idls("[PrimaryGlobal] interface Window {};");
                 idl_array.add_untested_idls("interface Navigator {};");
-                idl_array.add_untested_idls("interface ArrayBuffer {};");
                 idl_array.add_untested_idls("interface HTMLMediaElement {};");
                 idl_array.add_untested_idls("interface Event {};");
                 idl_array.add_untested_idls("interface EventTarget {};");

diff --git a/html/webappapis/animation-frames/idlharness.html b/html/webappapis/animation-frames/idlharness.html
@@ -15,7 +15,7 @@ <h1>idlharness test</h1>
 <p>This test validates the WebIDL included in the Timing control for script-based animations specification.</p>
 
 <pre id='untested_idl' style='display:none'>
-[PrimaryGlobal]
+[Global=Window, Exposed=Window]
 interface Window {
 };
 </pre>

diff --git a/interfaces/html.idl b/interfaces/html.idl
@@ -1530,7 +1530,9 @@ dictionary DragEventInit : MouseEventInit {
   DataTransfer? dataTransfer = null;
 };
 
-[PrimaryGlobal, LegacyUnenumerableNamedProperties]
+[Global=Window,
+ Exposed=Window,
+ LegacyUnenumerableNamedProperties]
 interface Window : EventTarget {
   // the current browsing context
   [Unforgeable] readonly attribute WindowProxy window;

diff --git a/media-capabilities/idlharness.html b/media-capabilities/idlharness.html
@@ -12,7 +12,7 @@
 <body>
 <h1>Media Session IDL tests</h1>
 <pre id='untested_idl' style='display:none'>
-[PrimaryGlobal]
+[Global=Window, Exposed=Window]
 interface Window {
 };
 interface Worker {

diff --git a/mediasession/idlharness.html b/mediasession/idlharness.html
@@ -13,7 +13,7 @@
 <h1>Media Session IDL tests</h1>
 
 <pre id='untested_idl' style='display:none'>
-[PrimaryGlobal]
+[Global=Window, Exposed=Global]
 interface Window {
 };
 

diff --git a/pointerevents/extension/idlharness.html b/pointerevents/extension/idlharness.html
@@ -7,7 +7,7 @@
 <script src="/resources/idlharness.js"></script>
 
 <pre id='untested_idl' style='display:none'>
-[PrimaryGlobal]
+[Global=Window, Exposed=Window]
 interface Window {
 };
 

diff --git a/pointerevents/idlharness.html b/pointerevents/idlharness.html
@@ -7,7 +7,7 @@
 <script src="/resources/idlharness.js"></script>
 
 <pre id='untested_idl' style='display:none'>
-[PrimaryGlobal]
+[Global=Window, Exposed=Window]
 interface Window {
 };
 

diff --git a/proximity/idlharness.html b/proximity/idlharness.html
@@ -15,7 +15,7 @@
 <div id="log"></div>
 
 <pre id="untested_idl">
-[PrimaryGlobal]
+[Global=Window, Exposed=Window]
 interface Window {
 };
 

diff --git a/requestidlecallback/idlharness.html b/requestidlecallback/idlharness.html
@@ -7,7 +7,7 @@
 <script src="/resources/idlharness.js"></script>
 
 <pre id='untested_idl' style='display:none'>
-[PrimaryGlobal]
+[Global=Window, Exposed=Window]
 interface Window {
 };
 </pre>

diff --git a/resources/idlharness.js b/resources/idlharness.js
@@ -936,8 +936,7 @@ IdlInterface.prototype.is_global = function()
 //@{
 {
     return this.extAttrs.some(function(attribute) {
-        return attribute.name === "Global" ||
-               attribute.name === "PrimaryGlobal";
+        return attribute.name === "Global";
     });
 };
 //@}
@@ -1356,7 +1355,7 @@ IdlInterface.prototype.test_self = function()
         // "The interface prototype object for a given interface A must have an
         // internal [[Prototype]] property whose value is returned from the
         // following steps:
-        // "If A is declared with the [Global] or [PrimaryGlobal] extended
+        // "If A is declared with the [Global] extended
         // attribute, and A supports named properties, then return the named
         // properties object for A, as defined in §3.6.4 Named properties
         // object.
@@ -1434,7 +1433,7 @@ IdlInterface.prototype.test_self = function()
         }
     }.bind(this), this.name + " interface: existence and properties of interface prototype object");
 
-    // "If the interface is declared with the [Global] or [PrimaryGlobal]
+    // "If the interface is declared with the [Global]
     // extended attribute, or the interface is in the set of inherited
     // interfaces for any other interface that is declared with one of these
     // attributes, then the interface prototype object must be an immutable
@@ -1780,7 +1779,7 @@ IdlInterface.prototype.test_member_operation = function(member)
                     "interface object missing static operation");
             memberHolderObject = self[this.name];
         // "* Otherwise, [...] if the interface was declared with the [Global]
-        //    or [PrimaryGlobal] extended attribute, then the property exists
+        //    extended attribute, then the property exists
         //    on every object that implements the interface."
         } else if (this.is_global()) {
             assert_own_property(self, member.name,
@@ -2128,7 +2127,7 @@ IdlInterface.prototype.test_primary_interface_of = function(desc, obj, exception
     }
 
     // "The internal [[SetPrototypeOf]] method of every platform object that
-    // implements an interface with the [Global] or [PrimaryGlobal] extended
+    // implements an interface with the [Global] extended
     // attribute must execute the same algorithm as is defined for the
     // [[SetPrototypeOf]] internal method of an immutable prototype exotic
     // object."

diff --git a/svg/interfaces.html b/svg/interfaces.html
@@ -13,7 +13,7 @@
 interface ProcessingInstruction : Node {};
 interface Element : Node {};
 interface HTMLElement : Element {};
-[PrimaryGlobal] interface Window {};
+[Global=Window, Exposed=Window] interface Window {};
 
 // Just need to know that DOMStringMap exists; its details are tested elsewhere.
 interface DOMStringMap { };

diff --git a/webstorage/idlharness.html b/webstorage/idlharness.html
@@ -15,7 +15,7 @@ <h1>Web Storage IDL tests</h1>
 <div id="log"></div>
 
 <pre id='untested_idl' style='display:none'>
-[PrimaryGlobal]
+[Global=Window, Exposed=Window]
 interface Window {
 };
 

diff --git a/webvr/idlharness.html b/webvr/idlharness.html
@@ -223,7 +223,7 @@ <h1 class="instructions">Description</h1>
     <script>
       setup( () => {
         var idl_array = new IdlArray();
-        idl_array.add_untested_idls("[PrimaryGlobal] interface Window {};");
+        idl_array.add_untested_idls("[Global=Window, Exposed=Window] interface Window {};");
         idl_array.add_untested_idls("interface Navigator {};");
         idl_array.add_untested_idls("interface Event {};");
         idl_array.add_untested_idls("interface EventTarget {};");