Diff
Modified: trunk/Source/WebCore/ChangeLog (207643 => 207644)
--- trunk/Source/WebCore/ChangeLog 2016-10-20 23:41:10 UTC (rev 207643)
+++ trunk/Source/WebCore/ChangeLog 2016-10-20 23:51:26 UTC (rev 207644)
@@ -1,3 +1,93 @@
+2016-10-20 Myles C. Maxfield <[email protected]>
+
+ Many WebGL functions which don't throw are marked as possibly throwing
+ https://bugs.webkit.org/show_bug.cgi?id=163747
+
+ Reviewed by Dean Jackson.
+
+ Mechanically remove the exception code.
+
+ No new tests because there is no behavior change.
+
+ * bindings/js/JSWebGLRenderingContextBaseCustom.cpp:
+ (WebCore::getObjectParameter):
+ (WebCore::JSWebGLRenderingContextBase::getAttachedShaders):
+ (WebCore::JSWebGLRenderingContextBase::getProgramParameter):
+ (WebCore::JSWebGLRenderingContextBase::getShaderParameter):
+ (WebCore::JSWebGLRenderingContextBase::getUniform):
+ (WebCore::dataFunctionf):
+ (WebCore::dataFunctioni):
+ (WebCore::dataFunctionMatrix):
+ * html/canvas/WebGL2RenderingContext.cpp:
+ (WebCore::WebGL2RenderingContext::texSubImage2D):
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::texSubImage2D):
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::activeTexture):
+ (WebCore::WebGLRenderingContextBase::attachShader):
+ (WebCore::WebGLRenderingContextBase::bindAttribLocation):
+ (WebCore::WebGLRenderingContextBase::bindBuffer):
+ (WebCore::WebGLRenderingContextBase::bindFramebuffer):
+ (WebCore::WebGLRenderingContextBase::bindRenderbuffer):
+ (WebCore::WebGLRenderingContextBase::bindTexture):
+ (WebCore::WebGLRenderingContextBase::bufferData):
+ (WebCore::WebGLRenderingContextBase::bufferSubData):
+ (WebCore::WebGLRenderingContextBase::compileShader):
+ (WebCore::WebGLRenderingContextBase::createShader):
+ (WebCore::WebGLRenderingContextBase::detachShader):
+ (WebCore::WebGLRenderingContextBase::disableVertexAttribArray):
+ (WebCore::WebGLRenderingContextBase::drawArrays):
+ (WebCore::WebGLRenderingContextBase::drawElements):
+ (WebCore::WebGLRenderingContextBase::enableVertexAttribArray):
+ (WebCore::WebGLRenderingContextBase::framebufferRenderbuffer):
+ (WebCore::WebGLRenderingContextBase::framebufferTexture2D):
+ (WebCore::WebGLRenderingContextBase::getActiveAttrib):
+ (WebCore::WebGLRenderingContextBase::getActiveUniform):
+ (WebCore::WebGLRenderingContextBase::getAttachedShaders):
+ (WebCore::WebGLRenderingContextBase::getBufferParameter):
+ (WebCore::WebGLRenderingContextBase::getProgramParameter):
+ (WebCore::WebGLRenderingContextBase::getProgramInfoLog):
+ (WebCore::WebGLRenderingContextBase::getRenderbufferParameter):
+ (WebCore::WebGLRenderingContextBase::getShaderParameter):
+ (WebCore::WebGLRenderingContextBase::getShaderInfoLog):
+ (WebCore::WebGLRenderingContextBase::getShaderPrecisionFormat):
+ (WebCore::WebGLRenderingContextBase::getShaderSource):
+ (WebCore::WebGLRenderingContextBase::getTexParameter):
+ (WebCore::WebGLRenderingContextBase::getUniform):
+ (WebCore::WebGLRenderingContextBase::getUniformLocation):
+ (WebCore::WebGLRenderingContextBase::getVertexAttrib):
+ (WebCore::WebGLRenderingContextBase::linkProgram):
+ (WebCore::WebGLRenderingContextBase::readPixels):
+ (WebCore::WebGLRenderingContextBase::shaderSource):
+ (WebCore::WebGLRenderingContextBase::videoFrameToImage):
+ (WebCore::WebGLRenderingContextBase::texImage2D):
+ (WebCore::WebGLRenderingContextBase::uniform1f):
+ (WebCore::WebGLRenderingContextBase::uniform1fv):
+ (WebCore::WebGLRenderingContextBase::uniform1i):
+ (WebCore::WebGLRenderingContextBase::uniform1iv):
+ (WebCore::WebGLRenderingContextBase::uniform2f):
+ (WebCore::WebGLRenderingContextBase::uniform2fv):
+ (WebCore::WebGLRenderingContextBase::uniform2i):
+ (WebCore::WebGLRenderingContextBase::uniform2iv):
+ (WebCore::WebGLRenderingContextBase::uniform3f):
+ (WebCore::WebGLRenderingContextBase::uniform3fv):
+ (WebCore::WebGLRenderingContextBase::uniform3i):
+ (WebCore::WebGLRenderingContextBase::uniform3iv):
+ (WebCore::WebGLRenderingContextBase::uniform4f):
+ (WebCore::WebGLRenderingContextBase::uniform4fv):
+ (WebCore::WebGLRenderingContextBase::uniform4i):
+ (WebCore::WebGLRenderingContextBase::uniform4iv):
+ (WebCore::WebGLRenderingContextBase::uniformMatrix2fv):
+ (WebCore::WebGLRenderingContextBase::uniformMatrix3fv):
+ (WebCore::WebGLRenderingContextBase::uniformMatrix4fv):
+ (WebCore::WebGLRenderingContextBase::useProgram):
+ (WebCore::WebGLRenderingContextBase::validateProgram):
+ (WebCore::WebGLRenderingContextBase::vertexAttribPointer):
+ (WebCore::WebGLRenderingContextBase::restoreCurrentFramebuffer):
+ (WebCore::WebGLRenderingContextBase::restoreCurrentTexture2D):
+ * html/canvas/WebGLRenderingContextBase.h:
+ * html/canvas/WebGLRenderingContextBase.idl:
+
2016-10-19 Myles C. Maxfield <[email protected]>
[macOS] [iOS] Disable variation fonts on macOS El Capitan and iOS 9
Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp (207643 => 207644)
--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp 2016-10-20 23:41:10 UTC (rev 207643)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp 2016-10-20 23:51:26 UTC (rev 207644)
@@ -205,17 +205,17 @@
WebGLGetInfo info;
switch (objectType) {
case kBuffer:
- info = context.getBufferParameter(target, pname, ec);
+ info = context.getBufferParameter(target, pname);
break;
case kRenderbuffer:
- info = context.getRenderbufferParameter(target, pname, ec);
+ info = context.getRenderbufferParameter(target, pname);
break;
case kTexture:
- info = context.getTexParameter(target, pname, ec);
+ info = context.getTexParameter(target, pname);
break;
case kVertexAttrib:
// target => index
- info = context.getVertexAttrib(target, pname, ec);
+ info = context.getVertexAttrib(target, pname);
break;
default:
notImplemented();
@@ -310,7 +310,7 @@
if (!program && !state.uncheckedArgument(0).isUndefinedOrNull())
return throwTypeError(&state, scope);
Vector<RefPtr<WebGLShader>> shaders;
- bool succeed = context.getAttachedShaders(program, shaders, ec);
+ bool succeed = context.getAttachedShaders(program, shaders);
if (ec) {
setDOMException(&state, ec);
return jsNull();
@@ -402,7 +402,7 @@
return throwTypeError(&state, scope);
unsigned pname = state.uncheckedArgument(1).toInt32(&state);
RETURN_IF_EXCEPTION(scope, JSValue());
- WebGLGetInfo info = context.getProgramParameter(program, pname, ec);
+ WebGLGetInfo info = context.getProgramParameter(program, pname);
if (ec) {
setDOMException(&state, ec);
return jsUndefined();
@@ -430,7 +430,7 @@
WebGLShader* shader = JSWebGLShader::toWrapped(state.uncheckedArgument(0));
unsigned pname = state.uncheckedArgument(1).toInt32(&state);
RETURN_IF_EXCEPTION(scope, JSValue());
- WebGLGetInfo info = context.getShaderParameter(shader, pname, ec);
+ WebGLGetInfo info = context.getShaderParameter(shader, pname);
if (ec) {
setDOMException(&state, ec);
return jsUndefined();
@@ -471,7 +471,7 @@
WebGLUniformLocation* location = JSWebGLUniformLocation::toWrapped(state.uncheckedArgument(1));
if (!location && !state.uncheckedArgument(1).isUndefinedOrNull())
return throwTypeError(&state, scope);
- WebGLGetInfo info = context.getUniform(program, location, ec);
+ WebGLGetInfo info = context.getUniform(program, location);
if (ec) {
setDOMException(&state, ec);
return jsUndefined();
@@ -558,16 +558,16 @@
if (webGLArray) {
switch (f) {
case f_uniform1v:
- context.uniform1fv(location, *webGLArray, ec);
+ context.uniform1fv(location, *webGLArray);
break;
case f_uniform2v:
- context.uniform2fv(location, *webGLArray, ec);
+ context.uniform2fv(location, *webGLArray);
break;
case f_uniform3v:
- context.uniform3fv(location, *webGLArray, ec);
+ context.uniform3fv(location, *webGLArray);
break;
case f_uniform4v:
- context.uniform4fv(location, *webGLArray, ec);
+ context.uniform4fv(location, *webGLArray);
break;
case f_vertexAttrib1v:
context.vertexAttrib1fv(index, *webGLArray);
@@ -593,16 +593,16 @@
switch (f) {
case f_uniform1v:
- context.uniform1fv(location, array.data(), array.size(), ec);
+ context.uniform1fv(location, array.data(), array.size());
break;
case f_uniform2v:
- context.uniform2fv(location, array.data(), array.size(), ec);
+ context.uniform2fv(location, array.data(), array.size());
break;
case f_uniform3v:
- context.uniform3fv(location, array.data(), array.size(), ec);
+ context.uniform3fv(location, array.data(), array.size());
break;
case f_uniform4v:
- context.uniform4fv(location, array.data(), array.size(), ec);
+ context.uniform4fv(location, array.data(), array.size());
break;
case f_vertexAttrib1v:
context.vertexAttrib1fv(index, array.data(), array.size());
@@ -640,16 +640,16 @@
if (webGLArray) {
switch (f) {
case f_uniform1v:
- context.uniform1iv(location, *webGLArray, ec);
+ context.uniform1iv(location, *webGLArray);
break;
case f_uniform2v:
- context.uniform2iv(location, *webGLArray, ec);
+ context.uniform2iv(location, *webGLArray);
break;
case f_uniform3v:
- context.uniform3iv(location, *webGLArray, ec);
+ context.uniform3iv(location, *webGLArray);
break;
case f_uniform4v:
- context.uniform4iv(location, *webGLArray, ec);
+ context.uniform4iv(location, *webGLArray);
break;
default:
break;
@@ -666,16 +666,16 @@
switch (f) {
case f_uniform1v:
- context.uniform1iv(location, array.data(), array.size(), ec);
+ context.uniform1iv(location, array.data(), array.size());
break;
case f_uniform2v:
- context.uniform2iv(location, array.data(), array.size(), ec);
+ context.uniform2iv(location, array.data(), array.size());
break;
case f_uniform3v:
- context.uniform3iv(location, array.data(), array.size(), ec);
+ context.uniform3iv(location, array.data(), array.size());
break;
case f_uniform4v:
- context.uniform4iv(location, array.data(), array.size(), ec);
+ context.uniform4iv(location, array.data(), array.size());
break;
default:
break;
@@ -701,21 +701,21 @@
RETURN_IF_EXCEPTION(scope, JSValue());
RefPtr<Float32Array> webGLArray = toFloat32Array(state.uncheckedArgument(2));
-
- ExceptionCode ec = 0;
+
if (webGLArray) {
switch (f) {
case f_uniformMatrix2fv:
- context.uniformMatrix2fv(location, transpose, *webGLArray, ec);
+ context.uniformMatrix2fv(location, transpose, *webGLArray);
break;
case f_uniformMatrix3fv:
- context.uniformMatrix3fv(location, transpose, *webGLArray, ec);
+ context.uniformMatrix3fv(location, transpose, *webGLArray);
break;
case f_uniformMatrix4fv:
- context.uniformMatrix4fv(location, transpose, *webGLArray, ec);
+ context.uniformMatrix4fv(location, transpose, *webGLArray);
break;
}
-
+
+ ExceptionCode ec = 0;
setDOMException(&state, ec);
return jsUndefined();
}
@@ -726,16 +726,17 @@
switch (f) {
case f_uniformMatrix2fv:
- context.uniformMatrix2fv(location, transpose, array.data(), array.size(), ec);
+ context.uniformMatrix2fv(location, transpose, array.data(), array.size());
break;
case f_uniformMatrix3fv:
- context.uniformMatrix3fv(location, transpose, array.data(), array.size(), ec);
+ context.uniformMatrix3fv(location, transpose, array.data(), array.size());
break;
case f_uniformMatrix4fv:
- context.uniformMatrix4fv(location, transpose, array.data(), array.size(), ec);
+ context.uniformMatrix4fv(location, transpose, array.data(), array.size());
break;
}
-
+
+ ExceptionCode ec = 0;
setDOMException(&state, ec);
return jsUndefined();
}
Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (207643 => 207644)
--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2016-10-20 23:41:10 UTC (rev 207643)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2016-10-20 23:51:26 UTC (rev 207644)
@@ -1175,7 +1175,7 @@
|| !validateTexFunc("texSubImage2D", TexSubImage, SourceHTMLVideoElement, target, level, GraphicsContext3D::NONE, video->videoWidth(), video->videoHeight(), 0, format, type, xoffset, yoffset))
return;
- RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode(), ec);
+ RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode());
if (!image)
return;
texSubImage2DImpl(target, level, xoffset, yoffset, format, type, image.get(), GraphicsContext3D::HtmlDomVideo, m_unpackFlipY, m_unpackPremultiplyAlpha, ec);
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (207643 => 207644)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2016-10-20 23:41:10 UTC (rev 207643)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2016-10-20 23:51:26 UTC (rev 207644)
@@ -657,7 +657,7 @@
|| !validateTexFunc("texSubImage2D", TexSubImage, SourceHTMLVideoElement, target, level, format, video->videoWidth(), video->videoHeight(), 0, format, type, xoffset, yoffset))
return;
- RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode(), ec);
+ RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode());
if (!image)
return;
texSubImage2DImpl(target, level, xoffset, yoffset, format, type, image.get(), GraphicsContext3D::HtmlDomVideo, m_unpackFlipY, m_unpackPremultiplyAlpha, ec);
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (207643 => 207644)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-10-20 23:41:10 UTC (rev 207643)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-10-20 23:51:26 UTC (rev 207644)
@@ -845,7 +845,7 @@
return 0;
}
-void WebGLRenderingContextBase::activeTexture(GC3Denum texture, ExceptionCode&)
+void WebGLRenderingContextBase::activeTexture(GC3Denum texture)
{
if (isContextLostOrPending())
return;
@@ -857,7 +857,7 @@
m_context->activeTexture(texture);
}
-void WebGLRenderingContextBase::attachShader(WebGLProgram* program, WebGLShader* shader, ExceptionCode&)
+void WebGLRenderingContextBase::attachShader(WebGLProgram* program, WebGLShader* shader)
{
if (isContextLostOrPending() || !validateWebGLObject("attachShader", program) || !validateWebGLObject("attachShader", shader))
return;
@@ -869,7 +869,7 @@
shader->onAttached();
}
-void WebGLRenderingContextBase::bindAttribLocation(WebGLProgram* program, GC3Duint index, const String& name, ExceptionCode&)
+void WebGLRenderingContextBase::bindAttribLocation(WebGLProgram* program, GC3Duint index, const String& name)
{
if (isContextLostOrPending() || !validateWebGLObject("bindAttribLocation", program))
return;
@@ -903,7 +903,7 @@
return true;
}
-void WebGLRenderingContextBase::bindBuffer(GC3Denum target, WebGLBuffer* buffer, ExceptionCode&)
+void WebGLRenderingContextBase::bindBuffer(GC3Denum target, WebGLBuffer* buffer)
{
bool deleted;
if (!checkObjectToBeBound("bindBuffer", buffer, deleted))
@@ -928,7 +928,7 @@
buffer->setTarget(target);
}
-void WebGLRenderingContextBase::bindFramebuffer(GC3Denum target, WebGLFramebuffer* buffer, ExceptionCode&)
+void WebGLRenderingContextBase::bindFramebuffer(GC3Denum target, WebGLFramebuffer* buffer)
{
bool deleted;
if (!checkObjectToBeBound("bindFramebuffer", buffer, deleted))
@@ -946,7 +946,7 @@
applyStencilTest();
}
-void WebGLRenderingContextBase::bindRenderbuffer(GC3Denum target, WebGLRenderbuffer* renderBuffer, ExceptionCode&)
+void WebGLRenderingContextBase::bindRenderbuffer(GC3Denum target, WebGLRenderbuffer* renderBuffer)
{
bool deleted;
if (!checkObjectToBeBound("bindRenderbuffer", renderBuffer, deleted))
@@ -963,7 +963,7 @@
renderBuffer->setHasEverBeenBound();
}
-void WebGLRenderingContextBase::bindTexture(GC3Denum target, WebGLTexture* texture, ExceptionCode&)
+void WebGLRenderingContextBase::bindTexture(GC3Denum target, WebGLTexture* texture)
{
bool deleted;
if (!checkObjectToBeBound("bindTexture", texture, deleted))
@@ -1045,7 +1045,7 @@
m_context->blendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
}
-void WebGLRenderingContextBase::bufferData(GC3Denum target, long long size, GC3Denum usage, ExceptionCode&)
+void WebGLRenderingContextBase::bufferData(GC3Denum target, long long size, GC3Denum usage)
{
if (isContextLostOrPending())
return;
@@ -1075,7 +1075,7 @@
}
}
-void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage, ExceptionCode&)
+void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage)
{
if (isContextLostOrPending())
return;
@@ -1101,7 +1101,7 @@
}
}
-void WebGLRenderingContextBase::bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage, ExceptionCode&)
+void WebGLRenderingContextBase::bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage)
{
if (isContextLostOrPending())
return;
@@ -1127,7 +1127,7 @@
}
}
-void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data, ExceptionCode&)
+void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data)
{
if (isContextLostOrPending())
return;
@@ -1155,7 +1155,7 @@
}
}
-void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data, ExceptionCode&)
+void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data)
{
if (isContextLostOrPending())
return;
@@ -1249,7 +1249,7 @@
m_context->colorMask(red, green, blue, alpha);
}
-void WebGLRenderingContextBase::compileShader(WebGLShader* shader, ExceptionCode&)
+void WebGLRenderingContextBase::compileShader(WebGLShader* shader)
{
if (isContextLostOrPending() || !validateWebGLObject("compileShader", shader))
return;
@@ -1445,7 +1445,7 @@
return WTFMove(buffer);
}
-RefPtr<WebGLShader> WebGLRenderingContextBase::createShader(GC3Denum type, ExceptionCode&)
+RefPtr<WebGLShader> WebGLRenderingContextBase::createShader(GC3Denum type)
{
if (isContextLostOrPending())
return nullptr;
@@ -1570,7 +1570,7 @@
m_context->depthRange(zNear, zFar);
}
-void WebGLRenderingContextBase::detachShader(WebGLProgram* program, WebGLShader* shader, ExceptionCode&)
+void WebGLRenderingContextBase::detachShader(WebGLProgram* program, WebGLShader* shader)
{
if (isContextLostOrPending() || !validateWebGLObject("detachShader", program) || !validateWebGLObject("detachShader", shader))
return;
@@ -1596,7 +1596,7 @@
m_context->disable(cap);
}
-void WebGLRenderingContextBase::disableVertexAttribArray(GC3Duint index, ExceptionCode&)
+void WebGLRenderingContextBase::disableVertexAttribArray(GC3Duint index)
{
if (isContextLostOrPending())
return;
@@ -1938,7 +1938,7 @@
return true;
}
-void WebGLRenderingContextBase::drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count, ExceptionCode&)
+void WebGLRenderingContextBase::drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count)
{
if (!validateDrawArrays("drawArrays", mode, first, count, 0))
return;
@@ -1961,7 +1961,7 @@
markContextChanged();
}
-void WebGLRenderingContextBase::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, ExceptionCode&)
+void WebGLRenderingContextBase::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset)
{
unsigned numElements = 0;
if (!validateDrawElements("drawElements", mode, count, type, offset, numElements, 0))
@@ -2003,7 +2003,7 @@
m_context->enable(cap);
}
-void WebGLRenderingContextBase::enableVertexAttribArray(GC3Duint index, ExceptionCode&)
+void WebGLRenderingContextBase::enableVertexAttribArray(GC3Duint index)
{
if (isContextLostOrPending())
return;
@@ -2032,7 +2032,7 @@
m_context->flush();
}
-void WebGLRenderingContextBase::framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer* buffer, ExceptionCode&)
+void WebGLRenderingContextBase::framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer* buffer)
{
if (isContextLostOrPending() || !validateFramebufferFuncParameters("framebufferRenderbuffer", target, attachment))
return;
@@ -2064,7 +2064,7 @@
applyStencilTest();
}
-void WebGLRenderingContextBase::framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture* texture, GC3Dint level, ExceptionCode&)
+void WebGLRenderingContextBase::framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture* texture, GC3Dint level)
{
if (isContextLostOrPending() || !validateFramebufferFuncParameters("framebufferTexture2D", target, attachment))
return;
@@ -2145,7 +2145,7 @@
tex->generateMipmapLevelInfo();
}
-RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveAttrib(WebGLProgram* program, GC3Duint index, ExceptionCode&)
+RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveAttrib(WebGLProgram* program, GC3Duint index)
{
if (isContextLostOrPending() || !validateWebGLObject("getActiveAttrib", program))
return nullptr;
@@ -2158,7 +2158,7 @@
return WebGLActiveInfo::create(info.name, info.type, info.size);
}
-RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveUniform(WebGLProgram* program, GC3Duint index, ExceptionCode&)
+RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveUniform(WebGLProgram* program, GC3Duint index)
{
if (isContextLostOrPending() || !validateWebGLObject("getActiveUniform", program))
return nullptr;
@@ -2174,7 +2174,7 @@
return WebGLActiveInfo::create(info.name, info.type, info.size);
}
-bool WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program, Vector<RefPtr<WebGLShader>>& shaderObjects, ExceptionCode&)
+bool WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program, Vector<RefPtr<WebGLShader>>& shaderObjects)
{
shaderObjects.clear();
if (isContextLostOrPending() || !validateWebGLObject("getAttachedShaders", program))
@@ -2209,7 +2209,7 @@
return m_context->getAttribLocation(objectOrZero(program), name);
}
-WebGLGetInfo WebGLRenderingContextBase::getBufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&)
+WebGLGetInfo WebGLRenderingContextBase::getBufferParameter(GC3Denum target, GC3Denum pname)
{
if (isContextLostOrPending())
return WebGLGetInfo();
@@ -2255,7 +2255,7 @@
return m_context->getError();
}
-WebGLGetInfo WebGLRenderingContextBase::getProgramParameter(WebGLProgram* program, GC3Denum pname, ExceptionCode&)
+WebGLGetInfo WebGLRenderingContextBase::getProgramParameter(WebGLProgram* program, GC3Denum pname)
{
if (isContextLostOrPending() || !validateWebGLObject("getProgramParameter", program))
return WebGLGetInfo();
@@ -2282,7 +2282,7 @@
}
}
-String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program, ExceptionCode&)
+String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program)
{
if (isContextLostOrPending() || !validateWebGLObject("getProgramInfoLog", program))
return String();
@@ -2289,7 +2289,7 @@
return ensureNotNull(m_context->getProgramInfoLog(objectOrZero(program)));
}
-WebGLGetInfo WebGLRenderingContextBase::getRenderbufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&)
+WebGLGetInfo WebGLRenderingContextBase::getRenderbufferParameter(GC3Denum target, GC3Denum pname)
{
if (isContextLostOrPending())
return WebGLGetInfo();
@@ -2354,7 +2354,7 @@
}
}
-WebGLGetInfo WebGLRenderingContextBase::getShaderParameter(WebGLShader* shader, GC3Denum pname, ExceptionCode&)
+WebGLGetInfo WebGLRenderingContextBase::getShaderParameter(WebGLShader* shader, GC3Denum pname)
{
if (isContextLostOrPending() || !validateWebGLObject("getShaderParameter", shader))
return WebGLGetInfo();
@@ -2374,7 +2374,7 @@
}
}
-String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader, ExceptionCode&)
+String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader)
{
if (isContextLostOrPending() || !validateWebGLObject("getShaderInfoLog", shader))
return String();
@@ -2381,7 +2381,7 @@
return ensureNotNull(m_context->getShaderInfoLog(objectOrZero(shader)));
}
-RefPtr<WebGLShaderPrecisionFormat> WebGLRenderingContextBase::getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType, ExceptionCode&)
+RefPtr<WebGLShaderPrecisionFormat> WebGLRenderingContextBase::getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType)
{
if (isContextLostOrPending())
return nullptr;
@@ -2412,7 +2412,7 @@
return WebGLShaderPrecisionFormat::create(range[0], range[1], precision);
}
-String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader, ExceptionCode&)
+String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader)
{
if (isContextLostOrPending() || !validateWebGLObject("getShaderSource", shader))
return String();
@@ -2419,7 +2419,7 @@
return ensureNotNull(shader->getSource());
}
-WebGLGetInfo WebGLRenderingContextBase::getTexParameter(GC3Denum target, GC3Denum pname, ExceptionCode&)
+WebGLGetInfo WebGLRenderingContextBase::getTexParameter(GC3Denum target, GC3Denum pname)
{
if (isContextLostOrPending())
return WebGLGetInfo();
@@ -2447,7 +2447,7 @@
}
}
-WebGLGetInfo WebGLRenderingContextBase::getUniform(WebGLProgram* program, const WebGLUniformLocation* uniformLocation, ExceptionCode&)
+WebGLGetInfo WebGLRenderingContextBase::getUniform(WebGLProgram* program, const WebGLUniformLocation* uniformLocation)
{
if (isContextLostOrPending() || !validateWebGLObject("getUniform", program))
return WebGLGetInfo();
@@ -2574,7 +2574,7 @@
return WebGLGetInfo();
}
-RefPtr<WebGLUniformLocation> WebGLRenderingContextBase::getUniformLocation(WebGLProgram* program, const String& name, ExceptionCode&)
+RefPtr<WebGLUniformLocation> WebGLRenderingContextBase::getUniformLocation(WebGLProgram* program, const String& name)
{
if (isContextLostOrPending() || !validateWebGLObject("getUniformLocation", program))
return nullptr;
@@ -2612,7 +2612,7 @@
return nullptr;
}
-WebGLGetInfo WebGLRenderingContextBase::getVertexAttrib(GC3Duint index, GC3Denum pname, ExceptionCode&)
+WebGLGetInfo WebGLRenderingContextBase::getVertexAttrib(GC3Duint index, GC3Denum pname)
{
if (isContextLostOrPending())
return WebGLGetInfo();
@@ -2759,7 +2759,7 @@
m_context->lineWidth(width);
}
-void WebGLRenderingContextBase::linkProgram(WebGLProgram* program, ExceptionCode&)
+void WebGLRenderingContextBase::linkProgram(WebGLProgram* program)
{
if (isContextLostOrPending() || !validateWebGLObject("linkProgram", program))
return;
@@ -2819,7 +2819,7 @@
m_context->polygonOffset(factor, units);
}
-void WebGLRenderingContextBase::readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels, ExceptionCode&)
+void WebGLRenderingContextBase::readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels)
{
if (isContextLostOrPending())
return;
@@ -2927,7 +2927,7 @@
m_context->scissor(x, y, width, height);
}
-void WebGLRenderingContextBase::shaderSource(WebGLShader* shader, const String& string, ExceptionCode&)
+void WebGLRenderingContextBase::shaderSource(WebGLShader* shader, const String& string)
{
if (isContextLostOrPending() || !validateWebGLObject("shaderSource", shader))
return;
@@ -3249,7 +3249,7 @@
}
#if ENABLE(VIDEO)
-RefPtr<Image> WebGLRenderingContextBase::videoFrameToImage(HTMLVideoElement* video, BackingStoreCopy backingStoreCopy, ExceptionCode&)
+RefPtr<Image> WebGLRenderingContextBase::videoFrameToImage(HTMLVideoElement* video, BackingStoreCopy backingStoreCopy)
{
IntSize size(video->videoWidth(), video->videoHeight());
ImageBuffer* buf = m_generatedImageCache.imageBuffer(size);
@@ -3288,7 +3288,7 @@
}
// Normal pure SW path.
- RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode(), ec);
+ RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode());
if (!image)
return;
texImage2DImpl(target, level, internalformat, format, type, image.get(), GraphicsContext3D::HtmlDomVideo, m_unpackFlipY, m_unpackPremultiplyAlpha, ec);
@@ -3343,7 +3343,7 @@
texParameter(target, pname, 0, param, false);
}
-void WebGLRenderingContextBase::uniform1f(const WebGLUniformLocation* location, GC3Dfloat x, ExceptionCode&)
+void WebGLRenderingContextBase::uniform1f(const WebGLUniformLocation* location, GC3Dfloat x)
{
if (isContextLostOrPending() || !location)
return;
@@ -3356,7 +3356,7 @@
m_context->uniform1f(location->location(), x);
}
-void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, Float32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, Float32Array& v)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform1fv", location, v, 1))
return;
@@ -3364,7 +3364,7 @@
m_context->uniform1fv(location->location(), v.length(), v.data());
}
-void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform1fv", location, v, size, 1))
return;
@@ -3372,7 +3372,7 @@
m_context->uniform1fv(location->location(), size, v);
}
-void WebGLRenderingContextBase::uniform1i(const WebGLUniformLocation* location, GC3Dint x, ExceptionCode&)
+void WebGLRenderingContextBase::uniform1i(const WebGLUniformLocation* location, GC3Dint x)
{
if (isContextLostOrPending() || !location)
return;
@@ -3390,7 +3390,7 @@
m_context->uniform1i(location->location(), x);
}
-void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, Int32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, Int32Array& v)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform1iv", location, v, 1))
return;
@@ -3407,7 +3407,7 @@
m_context->uniform1iv(location->location(), v.length(), v.data());
}
-void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform1iv", location, v, size, 1))
return;
@@ -3423,7 +3423,7 @@
m_context->uniform1iv(location->location(), size, v);
}
-void WebGLRenderingContextBase::uniform2f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, ExceptionCode&)
+void WebGLRenderingContextBase::uniform2f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y)
{
if (isContextLostOrPending() || !location)
return;
@@ -3436,7 +3436,7 @@
m_context->uniform2f(location->location(), x, y);
}
-void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, Float32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, Float32Array& v)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform2fv", location, v, 2))
return;
@@ -3444,7 +3444,7 @@
m_context->uniform2fv(location->location(), v.length() / 2, v.data());
}
-void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform2fv", location, v, size, 2))
return;
@@ -3452,7 +3452,7 @@
m_context->uniform2fv(location->location(), size / 2, v);
}
-void WebGLRenderingContextBase::uniform2i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, ExceptionCode&)
+void WebGLRenderingContextBase::uniform2i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y)
{
if (isContextLostOrPending() || !location)
return;
@@ -3465,7 +3465,7 @@
m_context->uniform2i(location->location(), x, y);
}
-void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, Int32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, Int32Array& v)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform2iv", location, v, 2))
return;
@@ -3473,7 +3473,7 @@
m_context->uniform2iv(location->location(), v.length() / 2, v.data());
}
-void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform2iv", location, v, size, 2))
return;
@@ -3481,7 +3481,7 @@
m_context->uniform2iv(location->location(), size / 2, v);
}
-void WebGLRenderingContextBase::uniform3f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, ExceptionCode&)
+void WebGLRenderingContextBase::uniform3f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z)
{
if (isContextLostOrPending() || !location)
return;
@@ -3494,7 +3494,7 @@
m_context->uniform3f(location->location(), x, y, z);
}
-void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, Float32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, Float32Array& v)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform3fv", location, v, 3))
return;
@@ -3502,7 +3502,7 @@
m_context->uniform3fv(location->location(), v.length() / 3, v.data());
}
-void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform3fv", location, v, size, 3))
return;
@@ -3510,7 +3510,7 @@
m_context->uniform3fv(location->location(), size / 3, v);
}
-void WebGLRenderingContextBase::uniform3i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, ExceptionCode&)
+void WebGLRenderingContextBase::uniform3i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z)
{
if (isContextLostOrPending() || !location)
return;
@@ -3523,7 +3523,7 @@
m_context->uniform3i(location->location(), x, y, z);
}
-void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, Int32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, Int32Array& v)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform3iv", location, v, 3))
return;
@@ -3531,7 +3531,7 @@
m_context->uniform3iv(location->location(), v.length() / 3, v.data());
}
-void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform3iv", location, v, size, 3))
return;
@@ -3539,7 +3539,7 @@
m_context->uniform3iv(location->location(), size / 3, v);
}
-void WebGLRenderingContextBase::uniform4f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w, ExceptionCode&)
+void WebGLRenderingContextBase::uniform4f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w)
{
if (isContextLostOrPending() || !location)
return;
@@ -3552,7 +3552,7 @@
m_context->uniform4f(location->location(), x, y, z, w);
}
-void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, Float32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, Float32Array& v)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform4fv", location, v, 4))
return;
@@ -3560,7 +3560,7 @@
m_context->uniform4fv(location->location(), v.length() / 4, v.data());
}
-void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform4fv", location, v, size, 4))
return;
@@ -3568,7 +3568,7 @@
m_context->uniform4fv(location->location(), size / 4, v);
}
-void WebGLRenderingContextBase::uniform4i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w, ExceptionCode&)
+void WebGLRenderingContextBase::uniform4i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w)
{
if (isContextLostOrPending() || !location)
return;
@@ -3581,7 +3581,7 @@
m_context->uniform4i(location->location(), x, y, z, w);
}
-void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, Int32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, Int32Array& v)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform4iv", location, v, 4))
return;
@@ -3589,7 +3589,7 @@
m_context->uniform4iv(location->location(), v.length() / 4, v.data());
}
-void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformParameters("uniform4iv", location, v, size, 4))
return;
@@ -3597,7 +3597,7 @@
m_context->uniform4iv(location->location(), size / 4, v);
}
-void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v)
{
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose, v, 4))
return;
@@ -3604,7 +3604,7 @@
m_context->uniformMatrix2fv(location->location(), v.length() / 4, transpose, v.data());
}
-void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose, v, size, 4))
return;
@@ -3611,7 +3611,7 @@
m_context->uniformMatrix2fv(location->location(), size / 4, transpose, v);
}
-void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v)
{
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose, v, 9))
return;
@@ -3618,7 +3618,7 @@
m_context->uniformMatrix3fv(location->location(), v.length() / 9, transpose, v.data());
}
-void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose, v, size, 9))
return;
@@ -3625,7 +3625,7 @@
m_context->uniformMatrix3fv(location->location(), size / 9, transpose, v);
}
-void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v, ExceptionCode&)
+void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v)
{
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose, v, 16))
return;
@@ -3632,7 +3632,7 @@
m_context->uniformMatrix4fv(location->location(), v.length() / 16, transpose, v.data());
}
-void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
+void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size)
{
if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose, v, size, 16))
return;
@@ -3639,7 +3639,7 @@
m_context->uniformMatrix4fv(location->location(), size / 16, transpose, v);
}
-void WebGLRenderingContextBase::useProgram(WebGLProgram* program, ExceptionCode&)
+void WebGLRenderingContextBase::useProgram(WebGLProgram* program)
{
bool deleted;
if (!checkObjectToBeBound("useProgram", program, deleted))
@@ -3660,7 +3660,7 @@
}
}
-void WebGLRenderingContextBase::validateProgram(WebGLProgram* program, ExceptionCode&)
+void WebGLRenderingContextBase::validateProgram(WebGLProgram* program)
{
if (isContextLostOrPending() || !validateWebGLObject("validateProgram", program))
return;
@@ -3727,7 +3727,7 @@
vertexAttribfvImpl("vertexAttrib4fv", index, v, size, 4);
}
-void WebGLRenderingContextBase::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, long long offset, ExceptionCode&)
+void WebGLRenderingContextBase::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, long long offset)
{
if (isContextLostOrPending())
return;
@@ -4983,15 +4983,13 @@
void WebGLRenderingContextBase::restoreCurrentFramebuffer()
{
- ExceptionCode ec;
- bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_framebufferBinding.get(), ec);
+ bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_framebufferBinding.get());
}
void WebGLRenderingContextBase::restoreCurrentTexture2D()
{
- ExceptionCode ec;
auto texture = m_textureUnits[m_activeTextureUnit].texture2DBinding.get();
- bindTexture(GraphicsContext3D::TEXTURE_2D, texture, ec);
+ bindTexture(GraphicsContext3D::TEXTURE_2D, texture);
if (texture && texture->needToUseBlackTexture(textureExtensionFlags()))
m_unrenderableTextureUnits.add(m_activeTextureUnit);
}
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (207643 => 207644)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2016-10-20 23:41:10 UTC (rev 207643)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h 2016-10-20 23:51:26 UTC (rev 207644)
@@ -125,13 +125,13 @@
int drawingBufferWidth() const;
int drawingBufferHeight() const;
- void activeTexture(GC3Denum texture, ExceptionCode&);
- void attachShader(WebGLProgram*, WebGLShader*, ExceptionCode&);
- void bindAttribLocation(WebGLProgram*, GC3Duint index, const String& name, ExceptionCode&);
- void bindBuffer(GC3Denum target, WebGLBuffer*, ExceptionCode&);
- void bindFramebuffer(GC3Denum target, WebGLFramebuffer*, ExceptionCode&);
- void bindRenderbuffer(GC3Denum target, WebGLRenderbuffer*, ExceptionCode&);
- void bindTexture(GC3Denum target, WebGLTexture*, ExceptionCode&);
+ void activeTexture(GC3Denum texture);
+ void attachShader(WebGLProgram*, WebGLShader*);
+ void bindAttribLocation(WebGLProgram*, GC3Duint index, const String& name);
+ void bindBuffer(GC3Denum target, WebGLBuffer*);
+ void bindFramebuffer(GC3Denum target, WebGLFramebuffer*);
+ void bindRenderbuffer(GC3Denum target, WebGLRenderbuffer*);
+ void bindTexture(GC3Denum target, WebGLTexture*);
void blendColor(GC3Dfloat red, GC3Dfloat green, GC3Dfloat blue, GC3Dfloat alpha);
void blendEquation(GC3Denum mode);
void blendEquationSeparate(GC3Denum modeRGB, GC3Denum modeAlpha);
@@ -138,11 +138,11 @@
void blendFunc(GC3Denum sfactor, GC3Denum dfactor);
void blendFuncSeparate(GC3Denum srcRGB, GC3Denum dstRGB, GC3Denum srcAlpha, GC3Denum dstAlpha);
- void bufferData(GC3Denum target, long long size, GC3Denum usage, ExceptionCode&);
- void bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage, ExceptionCode&);
- void bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage, ExceptionCode&);
- void bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data, ExceptionCode&);
- void bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data, ExceptionCode&);
+ void bufferData(GC3Denum target, long long size, GC3Denum usage);
+ void bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage);
+ void bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage);
+ void bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data);
+ void bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data);
GC3Denum checkFramebufferStatus(GC3Denum target);
virtual void clear(GC3Dbitfield mask) = 0;
@@ -150,7 +150,7 @@
void clearDepth(GC3Dfloat);
void clearStencil(GC3Dint);
void colorMask(GC3Dboolean red, GC3Dboolean green, GC3Dboolean blue, GC3Dboolean alpha);
- void compileShader(WebGLShader*, ExceptionCode&);
+ void compileShader(WebGLShader*);
void compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, ArrayBufferView& data);
void compressedTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, ArrayBufferView& data);
@@ -162,7 +162,7 @@
RefPtr<WebGLFramebuffer> createFramebuffer();
RefPtr<WebGLProgram> createProgram();
RefPtr<WebGLRenderbuffer> createRenderbuffer();
- RefPtr<WebGLShader> createShader(GC3Denum type, ExceptionCode&);
+ RefPtr<WebGLShader> createShader(GC3Denum type);
RefPtr<WebGLTexture> createTexture();
void cullFace(GC3Denum mode);
@@ -177,43 +177,43 @@
void depthFunc(GC3Denum);
void depthMask(GC3Dboolean);
void depthRange(GC3Dfloat zNear, GC3Dfloat zFar);
- void detachShader(WebGLProgram*, WebGLShader*, ExceptionCode&);
+ void detachShader(WebGLProgram*, WebGLShader*);
void disable(GC3Denum cap);
- void disableVertexAttribArray(GC3Duint index, ExceptionCode&);
- void drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count, ExceptionCode&);
- void drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, ExceptionCode&);
+ void disableVertexAttribArray(GC3Duint index);
+ void drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count);
+ void drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset);
void enable(GC3Denum cap);
- void enableVertexAttribArray(GC3Duint index, ExceptionCode&);
+ void enableVertexAttribArray(GC3Duint index);
void finish();
void flush();
- void framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer*, ExceptionCode&);
- void framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture*, GC3Dint level, ExceptionCode&);
+ void framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer*);
+ void framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture*, GC3Dint level);
void frontFace(GC3Denum mode);
void generateMipmap(GC3Denum target);
- RefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GC3Duint index, ExceptionCode&);
- RefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GC3Duint index, ExceptionCode&);
- bool getAttachedShaders(WebGLProgram*, Vector<RefPtr<WebGLShader>>&, ExceptionCode&);
+ RefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GC3Duint index);
+ RefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GC3Duint index);
+ bool getAttachedShaders(WebGLProgram*, Vector<RefPtr<WebGLShader>>&);
GC3Dint getAttribLocation(WebGLProgram*, const String& name);
- WebGLGetInfo getBufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&);
+ WebGLGetInfo getBufferParameter(GC3Denum target, GC3Denum pname);
RefPtr<WebGLContextAttributes> getContextAttributes();
GC3Denum getError();
virtual WebGLExtension* getExtension(const String& name) = 0;
virtual WebGLGetInfo getFramebufferAttachmentParameter(GC3Denum target, GC3Denum attachment, GC3Denum pname, ExceptionCode&) = 0;
virtual WebGLGetInfo getParameter(GC3Denum pname, ExceptionCode&) = 0;
- WebGLGetInfo getProgramParameter(WebGLProgram*, GC3Denum pname, ExceptionCode&);
- String getProgramInfoLog(WebGLProgram*, ExceptionCode&);
- WebGLGetInfo getRenderbufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&);
- WebGLGetInfo getShaderParameter(WebGLShader*, GC3Denum pname, ExceptionCode&);
- String getShaderInfoLog(WebGLShader*, ExceptionCode&);
- RefPtr<WebGLShaderPrecisionFormat> getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType, ExceptionCode&);
- String getShaderSource(WebGLShader*, ExceptionCode&);
+ WebGLGetInfo getProgramParameter(WebGLProgram*, GC3Denum pname);
+ String getProgramInfoLog(WebGLProgram*);
+ WebGLGetInfo getRenderbufferParameter(GC3Denum target, GC3Denum pname);
+ WebGLGetInfo getShaderParameter(WebGLShader*, GC3Denum pname);
+ String getShaderInfoLog(WebGLShader*);
+ RefPtr<WebGLShaderPrecisionFormat> getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType);
+ String getShaderSource(WebGLShader*);
virtual Vector<String> getSupportedExtensions() = 0;
- WebGLGetInfo getTexParameter(GC3Denum target, GC3Denum pname, ExceptionCode&);
- WebGLGetInfo getUniform(WebGLProgram*, const WebGLUniformLocation*, ExceptionCode&);
- RefPtr<WebGLUniformLocation> getUniformLocation(WebGLProgram*, const String&, ExceptionCode&);
- WebGLGetInfo getVertexAttrib(GC3Duint index, GC3Denum pname, ExceptionCode&);
+ WebGLGetInfo getTexParameter(GC3Denum target, GC3Denum pname);
+ WebGLGetInfo getUniform(WebGLProgram*, const WebGLUniformLocation*);
+ RefPtr<WebGLUniformLocation> getUniformLocation(WebGLProgram*, const String&);
+ WebGLGetInfo getVertexAttrib(GC3Duint index, GC3Denum pname);
long long getVertexAttribOffset(GC3Duint index, GC3Denum pname);
virtual void hint(GC3Denum target, GC3Denum mode) = 0;
@@ -227,15 +227,15 @@
GC3Dboolean isTexture(WebGLTexture*);
void lineWidth(GC3Dfloat);
- void linkProgram(WebGLProgram*, ExceptionCode&);
+ void linkProgram(WebGLProgram*);
void pixelStorei(GC3Denum pname, GC3Dint param);
void polygonOffset(GC3Dfloat factor, GC3Dfloat units);
- void readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels, ExceptionCode&);
+ void readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels);
void releaseShaderCompiler();
virtual void renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height) = 0;
void sampleCoverage(GC3Dfloat value, GC3Dboolean invert);
void scissor(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);
- void shaderSource(WebGLShader*, const String&, ExceptionCode&);
+ void shaderSource(WebGLShader*, const String&);
void stencilFunc(GC3Denum func, GC3Dint ref, GC3Duint mask);
void stencilFuncSeparate(GC3Denum face, GC3Denum func, GC3Dint ref, GC3Duint mask);
void stencilMask(GC3Duint);
@@ -274,39 +274,39 @@
GC3Denum format, GC3Denum type, HTMLVideoElement*, ExceptionCode&) = 0;
#endif
- void uniform1f(const WebGLUniformLocation*, GC3Dfloat x, ExceptionCode&);
- void uniform1fv(const WebGLUniformLocation*, Float32Array& v, ExceptionCode&);
- void uniform1fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei, ExceptionCode&);
- void uniform1i(const WebGLUniformLocation*, GC3Dint x, ExceptionCode&);
- void uniform1iv(const WebGLUniformLocation*, Int32Array& v, ExceptionCode&);
- void uniform1iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei, ExceptionCode&);
- void uniform2f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y, ExceptionCode&);
- void uniform2fv(const WebGLUniformLocation*, Float32Array& v, ExceptionCode&);
- void uniform2fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei, ExceptionCode&);
- void uniform2i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y, ExceptionCode&);
- void uniform2iv(const WebGLUniformLocation*, Int32Array& v, ExceptionCode&);
- void uniform2iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei, ExceptionCode&);
- void uniform3f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, ExceptionCode&);
- void uniform3fv(const WebGLUniformLocation*, Float32Array& v, ExceptionCode&);
- void uniform3fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei, ExceptionCode&);
- void uniform3i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y, GC3Dint z, ExceptionCode&);
- void uniform3iv(const WebGLUniformLocation*, Int32Array& v, ExceptionCode&);
- void uniform3iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei, ExceptionCode&);
- void uniform4f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w, ExceptionCode&);
- void uniform4fv(const WebGLUniformLocation*, Float32Array& v, ExceptionCode&);
- void uniform4fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei, ExceptionCode&);
- void uniform4i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w, ExceptionCode&);
- void uniform4iv(const WebGLUniformLocation*, Int32Array& v, ExceptionCode&);
- void uniform4iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei, ExceptionCode&);
- void uniformMatrix2fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value, ExceptionCode&);
- void uniformMatrix2fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei, ExceptionCode&);
- void uniformMatrix3fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value, ExceptionCode&);
- void uniformMatrix3fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei, ExceptionCode&);
- void uniformMatrix4fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value, ExceptionCode&);
- void uniformMatrix4fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei, ExceptionCode&);
+ void uniform1f(const WebGLUniformLocation*, GC3Dfloat x);
+ void uniform1fv(const WebGLUniformLocation*, Float32Array& v);
+ void uniform1fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei);
+ void uniform1i(const WebGLUniformLocation*, GC3Dint x);
+ void uniform1iv(const WebGLUniformLocation*, Int32Array& v);
+ void uniform1iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei);
+ void uniform2f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y);
+ void uniform2fv(const WebGLUniformLocation*, Float32Array& v);
+ void uniform2fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei);
+ void uniform2i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y);
+ void uniform2iv(const WebGLUniformLocation*, Int32Array& v);
+ void uniform2iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei);
+ void uniform3f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z);
+ void uniform3fv(const WebGLUniformLocation*, Float32Array& v);
+ void uniform3fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei);
+ void uniform3i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y, GC3Dint z);
+ void uniform3iv(const WebGLUniformLocation*, Int32Array& v);
+ void uniform3iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei);
+ void uniform4f(const WebGLUniformLocation*, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w);
+ void uniform4fv(const WebGLUniformLocation*, Float32Array& v);
+ void uniform4fv(const WebGLUniformLocation*, GC3Dfloat* v, GC3Dsizei);
+ void uniform4i(const WebGLUniformLocation*, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w);
+ void uniform4iv(const WebGLUniformLocation*, Int32Array& v);
+ void uniform4iv(const WebGLUniformLocation*, GC3Dint* v, GC3Dsizei);
+ void uniformMatrix2fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value);
+ void uniformMatrix2fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei);
+ void uniformMatrix3fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value);
+ void uniformMatrix3fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei);
+ void uniformMatrix4fv(const WebGLUniformLocation*, GC3Dboolean transpose, Float32Array& value);
+ void uniformMatrix4fv(const WebGLUniformLocation*, GC3Dboolean transpose, GC3Dfloat* value, GC3Dsizei);
- void useProgram(WebGLProgram*, ExceptionCode&);
- void validateProgram(WebGLProgram*, ExceptionCode&);
+ void useProgram(WebGLProgram*);
+ void validateProgram(WebGLProgram*);
void vertexAttrib1f(GC3Duint index, GC3Dfloat x);
void vertexAttrib1fv(GC3Duint index, Float32Array& values);
@@ -321,7 +321,7 @@
void vertexAttrib4fv(GC3Duint index, Float32Array& values);
void vertexAttrib4fv(GC3Duint index, GC3Dfloat* values, GC3Dsizei size);
void vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized,
- GC3Dsizei stride, long long offset, ExceptionCode&);
+ GC3Dsizei stride, long long offset);
void viewport(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);
@@ -429,7 +429,7 @@
RefPtr<Image> drawImageIntoBuffer(Image&, int width, int height, int deviceScaleFactor);
#if ENABLE(VIDEO)
- RefPtr<Image> videoFrameToImage(HTMLVideoElement*, BackingStoreCopy, ExceptionCode&);
+ RefPtr<Image> videoFrameToImage(HTMLVideoElement*, BackingStoreCopy);
#endif
WebGLTexture::TextureExtensionFlag textureExtensionFlags() const;
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl (207643 => 207644)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl 2016-10-20 23:41:10 UTC (rev 207643)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl 2016-10-20 23:51:26 UTC (rev 207644)
@@ -472,23 +472,23 @@
readonly attribute GLsizei drawingBufferWidth;
readonly attribute GLsizei drawingBufferHeight;
- [MayThrowLegacyException] void activeTexture(GLenum texture);
- [MayThrowLegacyException] void attachShader(WebGLProgram? program, WebGLShader? shader);
- [MayThrowLegacyException] void bindAttribLocation(WebGLProgram? program, GLuint index, DOMString name);
- [MayThrowLegacyException] void bindBuffer(GLenum target, WebGLBuffer? buffer);
- [MayThrowLegacyException] void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer);
- [MayThrowLegacyException] void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer);
- [MayThrowLegacyException] void bindTexture(GLenum target, WebGLTexture? texture);
+ void activeTexture(GLenum texture);
+ void attachShader(WebGLProgram? program, WebGLShader? shader);
+ void bindAttribLocation(WebGLProgram? program, GLuint index, DOMString name);
+ void bindBuffer(GLenum target, WebGLBuffer? buffer);
+ void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer);
+ void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer);
+ void bindTexture(GLenum target, WebGLTexture? texture);
void blendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
void blendEquation(GLenum mode);
void blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
void blendFunc(GLenum sfactor, GLenum dfactor);
void blendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
- [MayThrowLegacyException] void bufferData(GLenum target, ArrayBuffer? data, GLenum usage);
- [MayThrowLegacyException] void bufferData(GLenum target, ArrayBufferView? data, GLenum usage);
- [MayThrowLegacyException] void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
- [MayThrowLegacyException] void bufferSubData(GLenum target, GLintptr offset, ArrayBuffer? data);
- [MayThrowLegacyException] void bufferSubData(GLenum target, GLintptr offset, ArrayBufferView? data);
+ void bufferData(GLenum target, ArrayBuffer? data, GLenum usage);
+ void bufferData(GLenum target, ArrayBufferView? data, GLenum usage);
+ void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
+ void bufferSubData(GLenum target, GLintptr offset, ArrayBuffer? data);
+ void bufferSubData(GLenum target, GLintptr offset, ArrayBufferView? data);
GLenum checkFramebufferStatus(GLenum target);
void clear(GLbitfield mask);
@@ -496,12 +496,12 @@
void clearDepth(GLclampf depth);
void clearStencil(GLint s);
void colorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
- [MayThrowLegacyException] void compileShader(WebGLShader? shader);
+ void compileShader(WebGLShader? shader);
void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
GLsizei width, GLsizei height, GLint border, ArrayBufferView data);
void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
- GLsizei width, GLsizei height, GLenum format, ArrayBufferView data);
+ GLsizei width, GLsizei height, GLenum format, ArrayBufferView data);
void copyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
void copyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
@@ -510,7 +510,7 @@
WebGLFramebuffer createFramebuffer();
WebGLProgram createProgram();
WebGLRenderbuffer createRenderbuffer();
- [MayThrowLegacyException] WebGLShader createShader(GLenum type);
+ WebGLShader createShader(GLenum type);
WebGLTexture createTexture();
void cullFace(GLenum mode);
@@ -525,23 +525,23 @@
void depthFunc(GLenum func);
void depthMask(GLboolean flag);
void depthRange(GLclampf zNear, GLclampf zFar);
- [MayThrowLegacyException] void detachShader(WebGLProgram? program, WebGLShader? shader);
+ void detachShader(WebGLProgram? program, WebGLShader? shader);
void disable(GLenum cap);
- [MayThrowLegacyException] void disableVertexAttribArray(GLuint index);
- [MayThrowLegacyException] void drawArrays(GLenum mode, GLint first, GLsizei count);
- [MayThrowLegacyException] void drawElements(GLenum mode, GLsizei count, GLenum type, GLintptr offset);
+ void disableVertexAttribArray(GLuint index);
+ void drawArrays(GLenum mode, GLint first, GLsizei count);
+ void drawElements(GLenum mode, GLsizei count, GLenum type, GLintptr offset);
void enable(GLenum cap);
- [MayThrowLegacyException] void enableVertexAttribArray(GLuint index);
+ void enableVertexAttribArray(GLuint index);
void finish();
void flush();
- [MayThrowLegacyException] void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, WebGLRenderbuffer? renderbuffer);
- [MayThrowLegacyException] void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, WebGLTexture? texture, GLint level);
+ void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, WebGLRenderbuffer? renderbuffer);
+ void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, WebGLTexture? texture, GLint level);
void frontFace(GLenum mode);
void generateMipmap(GLenum target);
- [MayThrowLegacyException] WebGLActiveInfo getActiveAttrib(WebGLProgram? program, GLuint index);
- [MayThrowLegacyException] WebGLActiveInfo getActiveUniform(WebGLProgram? program, GLuint index);
+ WebGLActiveInfo getActiveAttrib(WebGLProgram? program, GLuint index);
+ WebGLActiveInfo getActiveUniform(WebGLProgram? program, GLuint index);
[Custom, MayThrowLegacyException] void getAttachedShaders(WebGLProgram? program);
@@ -559,15 +559,15 @@
[Custom, MayThrowLegacyException] any getFramebufferAttachmentParameter(GLenum target, GLenum attachment, GLenum pname);
[Custom, MayThrowLegacyException] any getParameter(GLenum pname);
[Custom, MayThrowLegacyException] any getProgramParameter(WebGLProgram? program, GLenum pname);
- [MayThrowLegacyException] DOMString? getProgramInfoLog(WebGLProgram? program);
+ DOMString? getProgramInfoLog(WebGLProgram? program);
[Custom, MayThrowLegacyException] any getRenderbufferParameter(GLenum target, GLenum pname);
[Custom, MayThrowLegacyException] any getShaderParameter(WebGLShader? shader, GLenum pname);
- [MayThrowLegacyException] DOMString? getShaderInfoLog(WebGLShader? shader);
+ DOMString? getShaderInfoLog(WebGLShader? shader);
- [MayThrowLegacyException] WebGLShaderPrecisionFormat getShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype);
+ WebGLShaderPrecisionFormat getShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype);
- [MayThrowLegacyException] DOMString? getShaderSource(WebGLShader? shader);
+ DOMString? getShaderSource(WebGLShader? shader);
[Custom] sequence<DOMString> getSupportedExtensions();
@@ -575,7 +575,7 @@
[Custom, MayThrowLegacyException] any getUniform(WebGLProgram? program, WebGLUniformLocation? location);
- [MayThrowLegacyException] WebGLUniformLocation getUniformLocation(WebGLProgram? program, DOMString name);
+ WebGLUniformLocation getUniformLocation(WebGLProgram? program, DOMString name);
[Custom, MayThrowLegacyException] any getVertexAttrib(GLuint index, GLenum pname);
@@ -591,17 +591,17 @@
GLboolean isShader(WebGLShader? shader);
GLboolean isTexture(WebGLTexture? texture);
void lineWidth(GLfloat width);
- [MayThrowLegacyException] void linkProgram(WebGLProgram? program);
+ void linkProgram(WebGLProgram? program);
void pixelStorei(GLenum pname, GLint param);
void polygonOffset(GLfloat factor, GLfloat units);
- [MayThrowLegacyException] void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView pixels);
+ void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView pixels);
void releaseShaderCompiler();
void renderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
void sampleCoverage(GLclampf value, GLboolean invert);
void scissor(GLint x, GLint y, GLsizei width, GLsizei height);
- [MayThrowLegacyException] void shaderSource(WebGLShader? shader, DOMString string);
+ void shaderSource(WebGLShader? shader, DOMString string);
void stencilFunc(GLenum func, GLint ref, GLuint mask);
void stencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
void stencilMask(GLuint mask);
@@ -640,21 +640,21 @@
GLenum format, GLenum type, HTMLVideoElement? video);
#endif
- [MayThrowLegacyException] void uniform1f(WebGLUniformLocation? location, GLfloat x);
+ void uniform1f(WebGLUniformLocation? location, GLfloat x);
[Custom, MayThrowLegacyException] void uniform1fv(WebGLUniformLocation? location, Float32Array v);
- [MayThrowLegacyException] void uniform1i(WebGLUniformLocation? location, GLint x);
+ void uniform1i(WebGLUniformLocation? location, GLint x);
[Custom, MayThrowLegacyException] void uniform1iv(WebGLUniformLocation? location, Int32Array v);
- [MayThrowLegacyException] void uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y);
+ void uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y);
[Custom, MayThrowLegacyException] void uniform2fv(WebGLUniformLocation? location, Float32Array v);
- [MayThrowLegacyException] void uniform2i(WebGLUniformLocation? location, GLint x, GLint y);
+ void uniform2i(WebGLUniformLocation? location, GLint x, GLint y);
[Custom, MayThrowLegacyException] void uniform2iv(WebGLUniformLocation? location, Int32Array v);
- [MayThrowLegacyException] void uniform3f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z);
+ void uniform3f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z);
[Custom, MayThrowLegacyException] void uniform3fv(WebGLUniformLocation? location, Float32Array v);
- [MayThrowLegacyException] void uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z);
+ void uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z);
[Custom, MayThrowLegacyException] void uniform3iv(WebGLUniformLocation? location, Int32Array v);
- [MayThrowLegacyException] void uniform4f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+ void uniform4f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
[Custom, MayThrowLegacyException] void uniform4fv(WebGLUniformLocation? location, Float32Array v);
- [MayThrowLegacyException] void uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w);
+ void uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w);
[Custom, MayThrowLegacyException] void uniform4iv(WebGLUniformLocation? location, Int32Array v);
[Custom, MayThrowLegacyException] void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array);
@@ -661,8 +661,8 @@
[Custom, MayThrowLegacyException] void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array);
[Custom, MayThrowLegacyException] void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array);
- [MayThrowLegacyException] void useProgram(WebGLProgram? program);
- [MayThrowLegacyException] void validateProgram(WebGLProgram? program);
+ void useProgram(WebGLProgram? program);
+ void validateProgram(WebGLProgram? program);
void vertexAttrib1f(GLuint indx, GLfloat x);
[Custom] void vertexAttrib1fv(GLuint indx, Float32Array values);
@@ -672,7 +672,7 @@
[Custom] void vertexAttrib3fv(GLuint indx, Float32Array values);
void vertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
[Custom] void vertexAttrib4fv(GLuint indx, Float32Array values);
- [MayThrowLegacyException] void vertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+ void vertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
void viewport(GLint x, GLint y, GLsizei width, GLsizei height);
};
