Update for Web IDL extended attribute changes

[NoInterfaceObject] → [LegacyNoInterfaceObject]. This follows whatwg/webidl#870. This also replaces a couple instances of [NoInterfaceObject] with the interface mixin concept, as was previously done in 2df151b and a6f9909.
domenic · Apr 8, 2020 · 2d43702 · 2d43702
1 parent e069440
commit 2d43702
Show file tree

Hide file tree

Showing 53 changed files with 69 additions and 75 deletions.
diff --git a/conformance-suites/1.0.2/conformance/typedarrays/array-unit-tests.html b/conformance-suites/1.0.2/conformance/typedarrays/array-unit-tests.html
@@ -186,9 +186,9 @@
 
   try {
     var foo = ArrayBufferView;
-    testFailed('ArrayBufferView has [NoInterfaceObject] extended attribute and should not be defined');
+    testFailed('ArrayBufferView is a typedef and should not be defined');
   } catch (e) {
-    testPassed('ArrayBufferView has [NoInterfaceObject] extended attribute and was (correctly) not defined');
+    testPassed('ArrayBufferView is a typedef and was (correctly) not defined');
   }
 }
 

diff --git a/conformance-suites/1.0.3/conformance/typedarrays/array-unit-tests.html b/conformance-suites/1.0.3/conformance/typedarrays/array-unit-tests.html
@@ -185,9 +185,9 @@
 
   try {
     var foo = ArrayBufferView;
-    testFailed('ArrayBufferView has [NoInterfaceObject] extended attribute and should not be defined');
+    testFailed('ArrayBufferView is a typedef and should not be defined');
   } catch (e) {
-    testPassed('ArrayBufferView has [NoInterfaceObject] extended attribute and was (correctly) not defined');
+    testPassed('ArrayBufferView is a typedef and was (correctly) not defined');
   }
 
   // Uint8ClampedArray inherited from Uint8Array in earlier versions

diff --git a/conformance-suites/2.0.0/conformance/typedarrays/array-unit-tests.html b/conformance-suites/2.0.0/conformance/typedarrays/array-unit-tests.html
@@ -185,9 +185,9 @@
 
   try {
     var foo = ArrayBufferView;
-    testFailed('ArrayBufferView has [NoInterfaceObject] extended attribute and should not be defined');
+    testFailed('ArrayBufferView is a typedef and should not be defined');
   } catch (e) {
-    testPassed('ArrayBufferView has [NoInterfaceObject] extended attribute and was (correctly) not defined');
+    testPassed('ArrayBufferView is a typedef and was (correctly) not defined');
   }
 
   // Uint8ClampedArray inherited from Uint8Array in earlier versions

diff --git a/extensions/ANGLE_instanced_arrays/extension.xml b/extensions/ANGLE_instanced_arrays/extension.xml
@@ -27,7 +27,7 @@
     </p>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface ANGLE_instanced_arrays {
     const GLenum VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE = 0x88FE;
     void drawArraysInstancedANGLE(GLenum mode, GLint first, GLsizei count, GLsizei primcount);

diff --git a/extensions/EXT_blend_minmax/extension.xml b/extensions/EXT_blend_minmax/extension.xml
@@ -31,7 +31,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface EXT_blend_minmax {
   const GLenum MIN_EXT = 0x8007;
   const GLenum MAX_EXT = 0x8008;

diff --git a/extensions/EXT_clip_cull_distance/extension.xml b/extensions/EXT_clip_cull_distance/extension.xml
@@ -36,7 +36,7 @@
   </overview>
 
   <idl xml:space="preserve">
-    [NoInterfaceObject]
+    [LegacyNoInterfaceObject]
     interface EXT_clip_cull_distance {
       const GLenum MAX_CLIP_DISTANCES_EXT                       = 0x0D32;
       const GLenum MAX_CULL_DISTANCES_EXT                       = 0x82F9;

diff --git a/extensions/EXT_color_buffer_float/extension.xml b/extensions/EXT_color_buffer_float/extension.xml
@@ -72,7 +72,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface EXT_color_buffer_float {
 }; // interface EXT_color_buffer_float
 </idl>

diff --git a/extensions/EXT_color_buffer_half_float/extension.xml b/extensions/EXT_color_buffer_half_float/extension.xml
@@ -72,7 +72,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface EXT_color_buffer_half_float {
   const GLenum RGBA16F_EXT = 0x881A;
   const GLenum RGB16F_EXT = 0x881B;

diff --git a/extensions/EXT_disjoint_timer_query/extension.xml b/extensions/EXT_disjoint_timer_query/extension.xml
@@ -48,11 +48,11 @@
   <idl xml:space="preserve">
 typedef unsigned long long GLuint64EXT;
 
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WebGLTimerQueryEXT : WebGLObject {
 };
 
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface EXT_disjoint_timer_query {
   const GLenum QUERY_COUNTER_BITS_EXT      = 0x8864;
   const GLenum CURRENT_QUERY_EXT           = 0x8865;

diff --git a/extensions/EXT_disjoint_timer_query_webgl2/extension.xml b/extensions/EXT_disjoint_timer_query_webgl2/extension.xml
@@ -42,7 +42,7 @@
   <idl xml:space="preserve">
 typedef unsigned long long GLuint64EXT;
 
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface EXT_disjoint_timer_query_webgl2 {
   const GLenum QUERY_COUNTER_BITS_EXT      = 0x8864;
   const GLenum TIME_ELAPSED_EXT            = 0x88BF;

diff --git a/extensions/EXT_float_blend/extension.xml b/extensions/EXT_float_blend/extension.xml
@@ -52,7 +52,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface EXT_float_blend {
 }; // interface EXT_float_blend
 </idl>

diff --git a/extensions/EXT_frag_depth/extension.xml b/extensions/EXT_frag_depth/extension.xml
@@ -36,7 +36,7 @@
   </overview>
 
   <idl xml:space="preserve">
-    [NoInterfaceObject]
+    [LegacyNoInterfaceObject]
     interface EXT_frag_depth {
     };
   </idl>

diff --git a/extensions/EXT_sRGB/extension.xml b/extensions/EXT_sRGB/extension.xml
@@ -32,7 +32,7 @@
   </overview>
 
   <idl xml:space="preserve">
-    [NoInterfaceObject]
+    [LegacyNoInterfaceObject]
     interface EXT_sRGB {
       const GLenum SRGB_EXT                                     = 0x8C40;
       const GLenum SRGB_ALPHA_EXT                               = 0x8C42;

diff --git a/extensions/EXT_shader_texture_lod/extension.xml b/extensions/EXT_shader_texture_lod/extension.xml
@@ -81,7 +81,7 @@
   </overview>
 
   <idl xml:space="preserve">
-    [NoInterfaceObject]
+    [LegacyNoInterfaceObject]
     interface EXT_shader_texture_lod {
     };
   </idl>

diff --git a/extensions/EXT_texture_filter_anisotropic/extension.xml b/extensions/EXT_texture_filter_anisotropic/extension.xml
@@ -26,7 +26,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface EXT_texture_filter_anisotropic {
   const GLenum TEXTURE_MAX_ANISOTROPY_EXT       = 0x84FE;
   const GLenum MAX_TEXTURE_MAX_ANISOTROPY_EXT   = 0x84FF;

diff --git a/extensions/OES_element_index_uint/extension.xml b/extensions/OES_element_index_uint/extension.xml
@@ -23,7 +23,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface OES_element_index_uint {
 };
   </idl>

diff --git a/extensions/OES_fbo_render_mipmap/extension.xml b/extensions/OES_fbo_render_mipmap/extension.xml
@@ -30,7 +30,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface OES_fbo_render_mipmap {
 };
   </idl>

diff --git a/extensions/OES_standard_derivatives/extension.xml b/extensions/OES_standard_derivatives/extension.xml
@@ -37,7 +37,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface OES_standard_derivatives {
     const GLenum FRAGMENT_SHADER_DERIVATIVE_HINT_OES = 0x8B8B;
 };

diff --git a/extensions/OES_texture_float/extension.xml b/extensions/OES_texture_float/extension.xml
@@ -44,7 +44,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface OES_texture_float { }; </idl>
 
   <history>

diff --git a/extensions/OES_texture_float_linear/extension.xml b/extensions/OES_texture_float_linear/extension.xml
@@ -28,7 +28,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface OES_texture_float_linear { };</idl>
 
   <history>

diff --git a/extensions/OES_texture_half_float/extension.xml b/extensions/OES_texture_half_float/extension.xml
@@ -44,7 +44,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface OES_texture_half_float {
   const GLenum HALF_FLOAT_OES = 0x8D61;
 };

diff --git a/extensions/OES_texture_half_float_linear/extension.xml b/extensions/OES_texture_half_float_linear/extension.xml
@@ -29,7 +29,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface OES_texture_half_float_linear { };</idl>
 
   <history>

diff --git a/extensions/OES_vertex_array_object/extension.xml b/extensions/OES_vertex_array_object/extension.xml
@@ -17,11 +17,11 @@
     <mirrors href="http://www.khronos.org/registry/gles/extensions/OES/OES_vertex_array_object.txt" name="OES_vertex_array_object" />
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WebGLVertexArrayObjectOES : WebGLObject {
 };
 
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface OES_vertex_array_object {
     const GLenum VERTEX_ARRAY_BINDING_OES = 0x85B5;
 

diff --git a/extensions/WEBGL_color_buffer_float/extension.xml b/extensions/WEBGL_color_buffer_float/extension.xml
@@ -73,7 +73,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_color_buffer_float {
   const GLenum RGBA32F_EXT = 0x8814;
   const GLenum FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT = 0x8211;

diff --git a/extensions/WEBGL_compressed_texture_astc/extension.xml b/extensions/WEBGL_compressed_texture_astc/extension.xml
@@ -304,7 +304,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_compressed_texture_astc {
     /* Compressed Texture Format */
     const GLenum COMPRESSED_RGBA_ASTC_4x4_KHR = 0x93B0;

diff --git a/extensions/WEBGL_compressed_texture_etc/extension.xml b/extensions/WEBGL_compressed_texture_etc/extension.xml
@@ -92,7 +92,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_compressed_texture_etc {
     /* Compressed Texture Formats */
     const GLenum COMPRESSED_R11_EAC                        = 0x9270;

diff --git a/extensions/WEBGL_compressed_texture_etc1/extension.xml b/extensions/WEBGL_compressed_texture_etc1/extension.xml
@@ -59,7 +59,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_compressed_texture_etc1 {
     /* Compressed Texture Format */
     const GLenum COMPRESSED_RGB_ETC1_WEBGL = 0x8D64; 

diff --git a/extensions/WEBGL_compressed_texture_pvrtc/extension.xml b/extensions/WEBGL_compressed_texture_pvrtc/extension.xml
@@ -74,7 +74,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_compressed_texture_pvrtc {
     /* Compressed Texture Formats */
     const GLenum COMPRESSED_RGB_PVRTC_4BPPV1_IMG      = 0x8C00;

diff --git a/extensions/WEBGL_compressed_texture_s3tc/extension.xml b/extensions/WEBGL_compressed_texture_s3tc/extension.xml
@@ -100,7 +100,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_compressed_texture_s3tc {
     /* Compressed Texture Formats */
     const GLenum COMPRESSED_RGB_S3TC_DXT1_EXT        = 0x83F0;

diff --git a/extensions/WEBGL_compressed_texture_s3tc_srgb/extension.xml b/extensions/WEBGL_compressed_texture_s3tc_srgb/extension.xml
@@ -100,7 +100,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_compressed_texture_s3tc_srgb {
     /* Compressed Texture Formats */
     const GLenum COMPRESSED_SRGB_S3TC_DXT1_EXT        = 0x8C4C;

diff --git a/extensions/WEBGL_debug_renderer_info/extension.xml b/extensions/WEBGL_debug_renderer_info/extension.xml
@@ -14,7 +14,7 @@
     <p>WebGL implementations might mask the <code>RENDERER</code> and <code>VENDOR</code> strings of the underlying graphics driver for privacy reasons. This extension exposes new tokens to query this information in a guaranteed manner for debugging purposes.</p>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_debug_renderer_info {
 
       const GLenum UNMASKED_VENDOR_WEBGL            = 0x9245;

diff --git a/extensions/WEBGL_debug_shaders/extension.xml b/extensions/WEBGL_debug_shaders/extension.xml
@@ -16,7 +16,7 @@
     </p>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_debug_shaders {
 
       DOMString getTranslatedShaderSource(WebGLShader shader);

diff --git a/extensions/WEBGL_depth_texture/extension.xml b/extensions/WEBGL_depth_texture/extension.xml
@@ -125,7 +125,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_depth_texture {
   const GLenum UNSIGNED_INT_24_8_WEBGL = 0x84FA;
 };

diff --git a/extensions/WEBGL_draw_buffers/extension.xml b/extensions/WEBGL_draw_buffers/extension.xml
@@ -100,7 +100,7 @@
     </features>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_draw_buffers {
     const GLenum COLOR_ATTACHMENT0_WEBGL     = 0x8CE0;
     const GLenum COLOR_ATTACHMENT1_WEBGL     = 0x8CE1;

diff --git a/extensions/WEBGL_lose_context/extension.xml b/extensions/WEBGL_lose_context/extension.xml
@@ -29,7 +29,7 @@
     </p>
   </overview>
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_lose_context {
       void loseContext();
       void restoreContext();

diff --git a/extensions/extension.xsl b/extensions/extension.xsl
@@ -411,7 +411,7 @@
 <xsl:template match="interface" mode="newfun">
   <dt class="idl-code">
 	<xsl:if test="@noobject = 'true'">
-	  <xsl:text>[NoInterfaceObject]</xsl:text><br/>
+	  <xsl:text>[LegacyLegacyNoInterfaceObject]</xsl:text><br/>
 	</xsl:if>
     <xsl:text>interface </xsl:text>
     <em><xsl:value-of select="@name" /></em>

diff --git a/extensions/proposals/WEBGL_debug/extension.xml b/extensions/proposals/WEBGL_debug/extension.xml
@@ -112,7 +112,7 @@
   </overview>
 
   <idl xml:space="preserve"><![CDATA[
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_debug : EventTarget {
   const GLenum MAX_DEBUG_MESSAGE_LENGTH_KHR = 0x9143;
   const GLenum MAX_DEBUG_GROUP_STACK_DEPTH_KHR = 0x826C;
@@ -155,7 +155,7 @@ interface WEBGL_debug : EventTarget {
   DOMString getObjectLabelKHR(WebGLObject? object);
 }; // interface WEBGL_debug
 
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WebGLDebugMessage : Event {
   readonly attribute GLenum source;
   readonly attribute GLenum type;

diff --git a/extensions/proposals/WEBGL_dynamic_texture/extension.xml b/extensions/proposals/WEBGL_dynamic_texture/extension.xml
@@ -192,7 +192,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_dynamic_texture {
   typedef double WDTNanoTime;
 
@@ -501,7 +501,7 @@ WDTNanoTime ustnow();</pre></li></p>
       <p>The <code>WDTStreamFrameInfo</code> interface represents information
       about a frame acquired from a WDTStream.</p>
 
-      <pre class="idl" xml:space="preserve">[NoInterfaceObject] interface WDTStreamFrameInfo {
+      <pre class="idl" xml:space="preserve">[LegacyNoInterfaceObject] interface WDTStreamFrameInfo {
   readonly attribute double frameTime;
   readonly attribute WDTNanoTime presentTime;
 };</pre>
@@ -531,7 +531,7 @@ WDTNanoTime ustnow();</pre></li></p>
       for controlling an image stream being fed to a dynamic texture
       object.</p>
 
-      <pre class="idl" xml:space="preserve">[NoInterfaceObject] interface WDTStream {
+      <pre class="idl" xml:space="preserve">[LegacyNoInterfaceObject] interface WDTStream {
   typedef (HTMLCanvasElement or
            HTMLImageElement or
            HTMLVideoElement) StreamSource;

diff --git a/extensions/proposals/WEBGL_subarray_uploads/extension.xml b/extensions/proposals/WEBGL_subarray_uploads/extension.xml
@@ -26,7 +26,7 @@
   </overview>
 
   <idl xml:space="preserve">
-[NoInterfaceObject]
+[LegacyNoInterfaceObject]
 interface WEBGL_subarray_uploads {
     void bufferSubData(GLenum target, GLsizeiptr bufferOffset, GLsizeiptr subarrayOffset,
                        GLsizeiptr subarraySize, (ArrayBuffer or SharedArrayBuffer) data);