Bug 1308057 - Update bindings. - r=qdot
MozReview-Commit-ID: AA79s0qaRzT
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -1386,21 +1386,16 @@ DOMInterfaces = {
'headerFile': 'WebGLSync.h'
},
'WebGLTexture': {
'nativeType': 'mozilla::WebGLTexture',
'headerFile': 'WebGLTexture.h'
},
-'WebGLTimerQueryEXT': {
- 'nativeType': 'mozilla::WebGLTimerQuery',
- 'headerFile': 'WebGLTimerQuery.h'
-},
-
'WebGLTransformFeedback': {
'nativeType': 'mozilla::WebGLTransformFeedback',
'headerFile': 'WebGLTransformFeedback.h'
},
'WebGLUniformLocation': {
'nativeType': 'mozilla::WebGLUniformLocation',
'headerFile': 'WebGLUniformLocation.h'
--- a/dom/webidl/WebGL2RenderingContext.webidl
+++ b/dom/webidl/WebGL2RenderingContext.webidl
@@ -6,20 +6,16 @@
* The source for this IDL is found at https://www.khronos.org/registry/webgl/specs/latest/2.0
* This IDL depends on WebGLRenderingContext.webidl
*/
typedef long long GLint64;
typedef unsigned long long GLuint64;
[Pref="webgl.enable-webgl2"]
-interface WebGLQuery {
-};
-
-[Pref="webgl.enable-webgl2"]
interface WebGLSampler {
};
[Pref="webgl.enable-webgl2"]
interface WebGLSync {
};
[Pref="webgl.enable-webgl2"]
@@ -620,17 +616,17 @@ interface WebGL2RenderingContext : WebGL
void clearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
/* Query Objects */
WebGLQuery? createQuery();
void deleteQuery(WebGLQuery? query);
[WebGLHandlesContextLoss] GLboolean isQuery(WebGLQuery? query);
void beginQuery(GLenum target, WebGLQuery? query);
void endQuery(GLenum target);
- WebGLQuery? getQuery(GLenum target, GLenum pname);
+ any getQuery(GLenum target, GLenum pname);
any getQueryParameter(WebGLQuery? query, GLenum pname);
/* Sampler Objects */
WebGLSampler? createSampler();
void deleteSampler(WebGLSampler? sampler);
[WebGLHandlesContextLoss] GLboolean isSampler(WebGLSampler? sampler);
void bindSampler(GLuint unit, WebGLSampler? sampler);
void samplerParameteri(WebGLSampler? sampler, GLenum pname, GLint param);
--- a/dom/webidl/WebGLRenderingContext.webidl
+++ b/dom/webidl/WebGLRenderingContext.webidl
@@ -999,30 +999,30 @@ interface ANGLE_instanced_arrays {
[NoInterfaceObject]
interface EXT_blend_minmax {
const GLenum MIN_EXT = 0x8007;
const GLenum MAX_EXT = 0x8008;
};
[NoInterfaceObject]
-interface WebGLTimerQueryEXT {
+interface WebGLQuery {
};
[NoInterfaceObject]
interface EXT_disjoint_timer_query {
const GLenum QUERY_COUNTER_BITS_EXT = 0x8864;
const GLenum CURRENT_QUERY_EXT = 0x8865;
const GLenum QUERY_RESULT_EXT = 0x8866;
const GLenum QUERY_RESULT_AVAILABLE_EXT = 0x8867;
const GLenum TIME_ELAPSED_EXT = 0x88BF;
const GLenum TIMESTAMP_EXT = 0x8E28;
const GLenum GPU_DISJOINT_EXT = 0x8FBB;
- WebGLTimerQueryEXT? createQueryEXT();
- void deleteQueryEXT(WebGLTimerQueryEXT? query);
- [WebGLHandlesContextLoss] boolean isQueryEXT(WebGLTimerQueryEXT? query);
- void beginQueryEXT(GLenum target, WebGLTimerQueryEXT? query);
+ WebGLQuery? createQueryEXT();
+ void deleteQueryEXT(WebGLQuery? query);
+ [WebGLHandlesContextLoss] boolean isQueryEXT(WebGLQuery? query);
+ void beginQueryEXT(GLenum target, WebGLQuery? query);
void endQueryEXT(GLenum target);
- void queryCounterEXT(WebGLTimerQueryEXT? query, GLenum target);
+ void queryCounterEXT(WebGLQuery? query, GLenum target);
any getQueryEXT(GLenum target, GLenum pname);
- any getQueryObjectEXT(WebGLTimerQueryEXT? query, GLenum pname);
+ any getQueryObjectEXT(WebGLQuery? query, GLenum pname);
};