<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207644] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207644">207644</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 16:51:26 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebGLRenderingContextBaseCustomcpp">trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGL2RenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseidl">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207643 => 207644)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,93 @@
</span><ins>+2016-10-20 Myles C. Maxfield <mmaxfield@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2016-10-19 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [macOS] [iOS] Disable variation fonts on macOS El Capitan and iOS 9
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGLRenderingContextBaseCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp (207643 => 207644)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -205,17 +205,17 @@
</span><span class="cx"> WebGLGetInfo info;
</span><span class="cx"> switch (objectType) {
</span><span class="cx"> case kBuffer:
</span><del>- info = context.getBufferParameter(target, pname, ec);
</del><ins>+ info = context.getBufferParameter(target, pname);
</ins><span class="cx"> break;
</span><span class="cx"> case kRenderbuffer:
</span><del>- info = context.getRenderbufferParameter(target, pname, ec);
</del><ins>+ info = context.getRenderbufferParameter(target, pname);
</ins><span class="cx"> break;
</span><span class="cx"> case kTexture:
</span><del>- info = context.getTexParameter(target, pname, ec);
</del><ins>+ info = context.getTexParameter(target, pname);
</ins><span class="cx"> break;
</span><span class="cx"> case kVertexAttrib:
</span><span class="cx"> // target => index
</span><del>- info = context.getVertexAttrib(target, pname, ec);
</del><ins>+ info = context.getVertexAttrib(target, pname);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> notImplemented();
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> if (!program && !state.uncheckedArgument(0).isUndefinedOrNull())
</span><span class="cx"> return throwTypeError(&state, scope);
</span><span class="cx"> Vector<RefPtr<WebGLShader>> shaders;
</span><del>- bool succeed = context.getAttachedShaders(program, shaders, ec);
</del><ins>+ bool succeed = context.getAttachedShaders(program, shaders);
</ins><span class="cx"> if (ec) {
</span><span class="cx"> setDOMException(&state, ec);
</span><span class="cx"> return jsNull();
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> return throwTypeError(&state, scope);
</span><span class="cx"> unsigned pname = state.uncheckedArgument(1).toInt32(&state);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><del>- WebGLGetInfo info = context.getProgramParameter(program, pname, ec);
</del><ins>+ WebGLGetInfo info = context.getProgramParameter(program, pname);
</ins><span class="cx"> if (ec) {
</span><span class="cx"> setDOMException(&state, ec);
</span><span class="cx"> return jsUndefined();
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> WebGLShader* shader = JSWebGLShader::toWrapped(state.uncheckedArgument(0));
</span><span class="cx"> unsigned pname = state.uncheckedArgument(1).toInt32(&state);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><del>- WebGLGetInfo info = context.getShaderParameter(shader, pname, ec);
</del><ins>+ WebGLGetInfo info = context.getShaderParameter(shader, pname);
</ins><span class="cx"> if (ec) {
</span><span class="cx"> setDOMException(&state, ec);
</span><span class="cx"> return jsUndefined();
</span><span class="lines">@@ -471,7 +471,7 @@
</span><span class="cx"> WebGLUniformLocation* location = JSWebGLUniformLocation::toWrapped(state.uncheckedArgument(1));
</span><span class="cx"> if (!location && !state.uncheckedArgument(1).isUndefinedOrNull())
</span><span class="cx"> return throwTypeError(&state, scope);
</span><del>- WebGLGetInfo info = context.getUniform(program, location, ec);
</del><ins>+ WebGLGetInfo info = context.getUniform(program, location);
</ins><span class="cx"> if (ec) {
</span><span class="cx"> setDOMException(&state, ec);
</span><span class="cx"> return jsUndefined();
</span><span class="lines">@@ -558,16 +558,16 @@
</span><span class="cx"> if (webGLArray) {
</span><span class="cx"> switch (f) {
</span><span class="cx"> case f_uniform1v:
</span><del>- context.uniform1fv(location, *webGLArray, ec);
</del><ins>+ context.uniform1fv(location, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform2v:
</span><del>- context.uniform2fv(location, *webGLArray, ec);
</del><ins>+ context.uniform2fv(location, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform3v:
</span><del>- context.uniform3fv(location, *webGLArray, ec);
</del><ins>+ context.uniform3fv(location, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform4v:
</span><del>- context.uniform4fv(location, *webGLArray, ec);
</del><ins>+ context.uniform4fv(location, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> case f_vertexAttrib1v:
</span><span class="cx"> context.vertexAttrib1fv(index, *webGLArray);
</span><span class="lines">@@ -593,16 +593,16 @@
</span><span class="cx">
</span><span class="cx"> switch (f) {
</span><span class="cx"> case f_uniform1v:
</span><del>- context.uniform1fv(location, array.data(), array.size(), ec);
</del><ins>+ context.uniform1fv(location, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform2v:
</span><del>- context.uniform2fv(location, array.data(), array.size(), ec);
</del><ins>+ context.uniform2fv(location, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform3v:
</span><del>- context.uniform3fv(location, array.data(), array.size(), ec);
</del><ins>+ context.uniform3fv(location, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform4v:
</span><del>- context.uniform4fv(location, array.data(), array.size(), ec);
</del><ins>+ context.uniform4fv(location, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> case f_vertexAttrib1v:
</span><span class="cx"> context.vertexAttrib1fv(index, array.data(), array.size());
</span><span class="lines">@@ -640,16 +640,16 @@
</span><span class="cx"> if (webGLArray) {
</span><span class="cx"> switch (f) {
</span><span class="cx"> case f_uniform1v:
</span><del>- context.uniform1iv(location, *webGLArray, ec);
</del><ins>+ context.uniform1iv(location, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform2v:
</span><del>- context.uniform2iv(location, *webGLArray, ec);
</del><ins>+ context.uniform2iv(location, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform3v:
</span><del>- context.uniform3iv(location, *webGLArray, ec);
</del><ins>+ context.uniform3iv(location, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform4v:
</span><del>- context.uniform4iv(location, *webGLArray, ec);
</del><ins>+ context.uniform4iv(location, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="lines">@@ -666,16 +666,16 @@
</span><span class="cx">
</span><span class="cx"> switch (f) {
</span><span class="cx"> case f_uniform1v:
</span><del>- context.uniform1iv(location, array.data(), array.size(), ec);
</del><ins>+ context.uniform1iv(location, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform2v:
</span><del>- context.uniform2iv(location, array.data(), array.size(), ec);
</del><ins>+ context.uniform2iv(location, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform3v:
</span><del>- context.uniform3iv(location, array.data(), array.size(), ec);
</del><ins>+ context.uniform3iv(location, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniform4v:
</span><del>- context.uniform4iv(location, array.data(), array.size(), ec);
</del><ins>+ context.uniform4iv(location, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="lines">@@ -701,21 +701,21 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx">
</span><span class="cx"> RefPtr<Float32Array> webGLArray = toFloat32Array(state.uncheckedArgument(2));
</span><del>-
- ExceptionCode ec = 0;
</del><ins>+
</ins><span class="cx"> if (webGLArray) {
</span><span class="cx"> switch (f) {
</span><span class="cx"> case f_uniformMatrix2fv:
</span><del>- context.uniformMatrix2fv(location, transpose, *webGLArray, ec);
</del><ins>+ context.uniformMatrix2fv(location, transpose, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniformMatrix3fv:
</span><del>- context.uniformMatrix3fv(location, transpose, *webGLArray, ec);
</del><ins>+ context.uniformMatrix3fv(location, transpose, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniformMatrix4fv:
</span><del>- context.uniformMatrix4fv(location, transpose, *webGLArray, ec);
</del><ins>+ context.uniformMatrix4fv(location, transpose, *webGLArray);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ ExceptionCode ec = 0;
</ins><span class="cx"> setDOMException(&state, ec);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="lines">@@ -726,16 +726,17 @@
</span><span class="cx">
</span><span class="cx"> switch (f) {
</span><span class="cx"> case f_uniformMatrix2fv:
</span><del>- context.uniformMatrix2fv(location, transpose, array.data(), array.size(), ec);
</del><ins>+ context.uniformMatrix2fv(location, transpose, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniformMatrix3fv:
</span><del>- context.uniformMatrix3fv(location, transpose, array.data(), array.size(), ec);
</del><ins>+ context.uniformMatrix3fv(location, transpose, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> case f_uniformMatrix4fv:
</span><del>- context.uniformMatrix4fv(location, transpose, array.data(), array.size(), ec);
</del><ins>+ context.uniformMatrix4fv(location, transpose, array.data(), array.size());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ ExceptionCode ec = 0;
</ins><span class="cx"> setDOMException(&state, ec);
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGL2RenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (207643 => 207644)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1175,7 +1175,7 @@
</span><span class="cx"> || !validateTexFunc("texSubImage2D", TexSubImage, SourceHTMLVideoElement, target, level, GraphicsContext3D::NONE, video->videoWidth(), video->videoHeight(), 0, format, type, xoffset, yoffset))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode(), ec);
</del><ins>+ RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode());
</ins><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><span class="cx"> texSubImage2DImpl(target, level, xoffset, yoffset, format, type, image.get(), GraphicsContext3D::HtmlDomVideo, m_unpackFlipY, m_unpackPremultiplyAlpha, ec);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (207643 => 207644)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -657,7 +657,7 @@
</span><span class="cx"> || !validateTexFunc("texSubImage2D", TexSubImage, SourceHTMLVideoElement, target, level, format, video->videoWidth(), video->videoHeight(), 0, format, type, xoffset, yoffset))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode(), ec);
</del><ins>+ RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode());
</ins><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><span class="cx"> texSubImage2DImpl(target, level, xoffset, yoffset, format, type, image.get(), GraphicsContext3D::HtmlDomVideo, m_unpackFlipY, m_unpackPremultiplyAlpha, ec);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (207643 => 207644)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -845,7 +845,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::activeTexture(GC3Denum texture, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::activeTexture(GC3Denum texture)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -857,7 +857,7 @@
</span><span class="cx"> m_context->activeTexture(texture);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::attachShader(WebGLProgram* program, WebGLShader* shader, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::attachShader(WebGLProgram* program, WebGLShader* shader)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("attachShader", program) || !validateWebGLObject("attachShader", shader))
</span><span class="cx"> return;
</span><span class="lines">@@ -869,7 +869,7 @@
</span><span class="cx"> shader->onAttached();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bindAttribLocation(WebGLProgram* program, GC3Duint index, const String& name, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bindAttribLocation(WebGLProgram* program, GC3Duint index, const String& name)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("bindAttribLocation", program))
</span><span class="cx"> return;
</span><span class="lines">@@ -903,7 +903,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bindBuffer(GC3Denum target, WebGLBuffer* buffer, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bindBuffer(GC3Denum target, WebGLBuffer* buffer)
</ins><span class="cx"> {
</span><span class="cx"> bool deleted;
</span><span class="cx"> if (!checkObjectToBeBound("bindBuffer", buffer, deleted))
</span><span class="lines">@@ -928,7 +928,7 @@
</span><span class="cx"> buffer->setTarget(target);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bindFramebuffer(GC3Denum target, WebGLFramebuffer* buffer, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bindFramebuffer(GC3Denum target, WebGLFramebuffer* buffer)
</ins><span class="cx"> {
</span><span class="cx"> bool deleted;
</span><span class="cx"> if (!checkObjectToBeBound("bindFramebuffer", buffer, deleted))
</span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx"> applyStencilTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bindRenderbuffer(GC3Denum target, WebGLRenderbuffer* renderBuffer, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bindRenderbuffer(GC3Denum target, WebGLRenderbuffer* renderBuffer)
</ins><span class="cx"> {
</span><span class="cx"> bool deleted;
</span><span class="cx"> if (!checkObjectToBeBound("bindRenderbuffer", renderBuffer, deleted))
</span><span class="lines">@@ -963,7 +963,7 @@
</span><span class="cx"> renderBuffer->setHasEverBeenBound();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bindTexture(GC3Denum target, WebGLTexture* texture, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bindTexture(GC3Denum target, WebGLTexture* texture)
</ins><span class="cx"> {
</span><span class="cx"> bool deleted;
</span><span class="cx"> if (!checkObjectToBeBound("bindTexture", texture, deleted))
</span><span class="lines">@@ -1045,7 +1045,7 @@
</span><span class="cx"> m_context->blendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bufferData(GC3Denum target, long long size, GC3Denum usage, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bufferData(GC3Denum target, long long size, GC3Denum usage)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -1075,7 +1075,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bufferData(GC3Denum target, ArrayBuffer* data, GC3Denum usage)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -1101,7 +1101,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bufferData(GC3Denum target, RefPtr<ArrayBufferView>&& data, GC3Denum usage)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -1127,7 +1127,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, ArrayBuffer* data)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -1155,7 +1155,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::bufferSubData(GC3Denum target, long long offset, RefPtr<ArrayBufferView>&& data)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -1249,7 +1249,7 @@
</span><span class="cx"> m_context->colorMask(red, green, blue, alpha);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::compileShader(WebGLShader* shader, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::compileShader(WebGLShader* shader)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("compileShader", shader))
</span><span class="cx"> return;
</span><span class="lines">@@ -1445,7 +1445,7 @@
</span><span class="cx"> return WTFMove(buffer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebGLShader> WebGLRenderingContextBase::createShader(GC3Denum type, ExceptionCode&)
</del><ins>+RefPtr<WebGLShader> WebGLRenderingContextBase::createShader(GC3Denum type)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1570,7 +1570,7 @@
</span><span class="cx"> m_context->depthRange(zNear, zFar);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::detachShader(WebGLProgram* program, WebGLShader* shader, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::detachShader(WebGLProgram* program, WebGLShader* shader)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("detachShader", program) || !validateWebGLObject("detachShader", shader))
</span><span class="cx"> return;
</span><span class="lines">@@ -1596,7 +1596,7 @@
</span><span class="cx"> m_context->disable(cap);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::disableVertexAttribArray(GC3Duint index, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::disableVertexAttribArray(GC3Duint index)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -1938,7 +1938,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count)
</ins><span class="cx"> {
</span><span class="cx"> if (!validateDrawArrays("drawArrays", mode, first, count, 0))
</span><span class="cx"> return;
</span><span class="lines">@@ -1961,7 +1961,7 @@
</span><span class="cx"> markContextChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset)
</ins><span class="cx"> {
</span><span class="cx"> unsigned numElements = 0;
</span><span class="cx"> if (!validateDrawElements("drawElements", mode, count, type, offset, numElements, 0))
</span><span class="lines">@@ -2003,7 +2003,7 @@
</span><span class="cx"> m_context->enable(cap);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::enableVertexAttribArray(GC3Duint index, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::enableVertexAttribArray(GC3Duint index)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -2032,7 +2032,7 @@
</span><span class="cx"> m_context->flush();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer* buffer, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer* buffer)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateFramebufferFuncParameters("framebufferRenderbuffer", target, attachment))
</span><span class="cx"> return;
</span><span class="lines">@@ -2064,7 +2064,7 @@
</span><span class="cx"> applyStencilTest();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture* texture, GC3Dint level, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture* texture, GC3Dint level)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateFramebufferFuncParameters("framebufferTexture2D", target, attachment))
</span><span class="cx"> return;
</span><span class="lines">@@ -2145,7 +2145,7 @@
</span><span class="cx"> tex->generateMipmapLevelInfo();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveAttrib(WebGLProgram* program, GC3Duint index, ExceptionCode&)
</del><ins>+RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveAttrib(WebGLProgram* program, GC3Duint index)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("getActiveAttrib", program))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -2158,7 +2158,7 @@
</span><span class="cx"> return WebGLActiveInfo::create(info.name, info.type, info.size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveUniform(WebGLProgram* program, GC3Duint index, ExceptionCode&)
</del><ins>+RefPtr<WebGLActiveInfo> WebGLRenderingContextBase::getActiveUniform(WebGLProgram* program, GC3Duint index)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("getActiveUniform", program))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -2174,7 +2174,7 @@
</span><span class="cx"> return WebGLActiveInfo::create(info.name, info.type, info.size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program, Vector<RefPtr<WebGLShader>>& shaderObjects, ExceptionCode&)
</del><ins>+bool WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program, Vector<RefPtr<WebGLShader>>& shaderObjects)
</ins><span class="cx"> {
</span><span class="cx"> shaderObjects.clear();
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("getAttachedShaders", program))
</span><span class="lines">@@ -2209,7 +2209,7 @@
</span><span class="cx"> return m_context->getAttribLocation(objectOrZero(program), name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLGetInfo WebGLRenderingContextBase::getBufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&)
</del><ins>+WebGLGetInfo WebGLRenderingContextBase::getBufferParameter(GC3Denum target, GC3Denum pname)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return WebGLGetInfo();
</span><span class="lines">@@ -2255,7 +2255,7 @@
</span><span class="cx"> return m_context->getError();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLGetInfo WebGLRenderingContextBase::getProgramParameter(WebGLProgram* program, GC3Denum pname, ExceptionCode&)
</del><ins>+WebGLGetInfo WebGLRenderingContextBase::getProgramParameter(WebGLProgram* program, GC3Denum pname)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("getProgramParameter", program))
</span><span class="cx"> return WebGLGetInfo();
</span><span class="lines">@@ -2282,7 +2282,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program, ExceptionCode&)
</del><ins>+String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("getProgramInfoLog", program))
</span><span class="cx"> return String();
</span><span class="lines">@@ -2289,7 +2289,7 @@
</span><span class="cx"> return ensureNotNull(m_context->getProgramInfoLog(objectOrZero(program)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLGetInfo WebGLRenderingContextBase::getRenderbufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&)
</del><ins>+WebGLGetInfo WebGLRenderingContextBase::getRenderbufferParameter(GC3Denum target, GC3Denum pname)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return WebGLGetInfo();
</span><span class="lines">@@ -2354,7 +2354,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLGetInfo WebGLRenderingContextBase::getShaderParameter(WebGLShader* shader, GC3Denum pname, ExceptionCode&)
</del><ins>+WebGLGetInfo WebGLRenderingContextBase::getShaderParameter(WebGLShader* shader, GC3Denum pname)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("getShaderParameter", shader))
</span><span class="cx"> return WebGLGetInfo();
</span><span class="lines">@@ -2374,7 +2374,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader, ExceptionCode&)
</del><ins>+String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("getShaderInfoLog", shader))
</span><span class="cx"> return String();
</span><span class="lines">@@ -2381,7 +2381,7 @@
</span><span class="cx"> return ensureNotNull(m_context->getShaderInfoLog(objectOrZero(shader)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebGLShaderPrecisionFormat> WebGLRenderingContextBase::getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType, ExceptionCode&)
</del><ins>+RefPtr<WebGLShaderPrecisionFormat> WebGLRenderingContextBase::getShaderPrecisionFormat(GC3Denum shaderType, GC3Denum precisionType)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -2412,7 +2412,7 @@
</span><span class="cx"> return WebGLShaderPrecisionFormat::create(range[0], range[1], precision);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader, ExceptionCode&)
</del><ins>+String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("getShaderSource", shader))
</span><span class="cx"> return String();
</span><span class="lines">@@ -2419,7 +2419,7 @@
</span><span class="cx"> return ensureNotNull(shader->getSource());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLGetInfo WebGLRenderingContextBase::getTexParameter(GC3Denum target, GC3Denum pname, ExceptionCode&)
</del><ins>+WebGLGetInfo WebGLRenderingContextBase::getTexParameter(GC3Denum target, GC3Denum pname)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return WebGLGetInfo();
</span><span class="lines">@@ -2447,7 +2447,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLGetInfo WebGLRenderingContextBase::getUniform(WebGLProgram* program, const WebGLUniformLocation* uniformLocation, ExceptionCode&)
</del><ins>+WebGLGetInfo WebGLRenderingContextBase::getUniform(WebGLProgram* program, const WebGLUniformLocation* uniformLocation)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("getUniform", program))
</span><span class="cx"> return WebGLGetInfo();
</span><span class="lines">@@ -2574,7 +2574,7 @@
</span><span class="cx"> return WebGLGetInfo();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebGLUniformLocation> WebGLRenderingContextBase::getUniformLocation(WebGLProgram* program, const String& name, ExceptionCode&)
</del><ins>+RefPtr<WebGLUniformLocation> WebGLRenderingContextBase::getUniformLocation(WebGLProgram* program, const String& name)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("getUniformLocation", program))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -2612,7 +2612,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLGetInfo WebGLRenderingContextBase::getVertexAttrib(GC3Duint index, GC3Denum pname, ExceptionCode&)
</del><ins>+WebGLGetInfo WebGLRenderingContextBase::getVertexAttrib(GC3Duint index, GC3Denum pname)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return WebGLGetInfo();
</span><span class="lines">@@ -2759,7 +2759,7 @@
</span><span class="cx"> m_context->lineWidth(width);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::linkProgram(WebGLProgram* program, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::linkProgram(WebGLProgram* program)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("linkProgram", program))
</span><span class="cx"> return;
</span><span class="lines">@@ -2819,7 +2819,7 @@
</span><span class="cx"> m_context->polygonOffset(factor, units);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -2927,7 +2927,7 @@
</span><span class="cx"> m_context->scissor(x, y, width, height);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::shaderSource(WebGLShader* shader, const String& string, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::shaderSource(WebGLShader* shader, const String& string)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("shaderSource", shader))
</span><span class="cx"> return;
</span><span class="lines">@@ -3249,7 +3249,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>-RefPtr<Image> WebGLRenderingContextBase::videoFrameToImage(HTMLVideoElement* video, BackingStoreCopy backingStoreCopy, ExceptionCode&)
</del><ins>+RefPtr<Image> WebGLRenderingContextBase::videoFrameToImage(HTMLVideoElement* video, BackingStoreCopy backingStoreCopy)
</ins><span class="cx"> {
</span><span class="cx"> IntSize size(video->videoWidth(), video->videoHeight());
</span><span class="cx"> ImageBuffer* buf = m_generatedImageCache.imageBuffer(size);
</span><span class="lines">@@ -3288,7 +3288,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Normal pure SW path.
</span><del>- RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode(), ec);
</del><ins>+ RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode());
</ins><span class="cx"> if (!image)
</span><span class="cx"> return;
</span><span class="cx"> texImage2DImpl(target, level, internalformat, format, type, image.get(), GraphicsContext3D::HtmlDomVideo, m_unpackFlipY, m_unpackPremultiplyAlpha, ec);
</span><span class="lines">@@ -3343,7 +3343,7 @@
</span><span class="cx"> texParameter(target, pname, 0, param, false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform1f(const WebGLUniformLocation* location, GC3Dfloat x, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform1f(const WebGLUniformLocation* location, GC3Dfloat x)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !location)
</span><span class="cx"> return;
</span><span class="lines">@@ -3356,7 +3356,7 @@
</span><span class="cx"> m_context->uniform1f(location->location(), x);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, Float32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, Float32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform1fv", location, v, 1))
</span><span class="cx"> return;
</span><span class="lines">@@ -3364,7 +3364,7 @@
</span><span class="cx"> m_context->uniform1fv(location->location(), v.length(), v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform1fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform1fv", location, v, size, 1))
</span><span class="cx"> return;
</span><span class="lines">@@ -3372,7 +3372,7 @@
</span><span class="cx"> m_context->uniform1fv(location->location(), size, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform1i(const WebGLUniformLocation* location, GC3Dint x, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform1i(const WebGLUniformLocation* location, GC3Dint x)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !location)
</span><span class="cx"> return;
</span><span class="lines">@@ -3390,7 +3390,7 @@
</span><span class="cx"> m_context->uniform1i(location->location(), x);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, Int32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, Int32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform1iv", location, v, 1))
</span><span class="cx"> return;
</span><span class="lines">@@ -3407,7 +3407,7 @@
</span><span class="cx"> m_context->uniform1iv(location->location(), v.length(), v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform1iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform1iv", location, v, size, 1))
</span><span class="cx"> return;
</span><span class="lines">@@ -3423,7 +3423,7 @@
</span><span class="cx"> m_context->uniform1iv(location->location(), size, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform2f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform2f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !location)
</span><span class="cx"> return;
</span><span class="lines">@@ -3436,7 +3436,7 @@
</span><span class="cx"> m_context->uniform2f(location->location(), x, y);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, Float32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, Float32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform2fv", location, v, 2))
</span><span class="cx"> return;
</span><span class="lines">@@ -3444,7 +3444,7 @@
</span><span class="cx"> m_context->uniform2fv(location->location(), v.length() / 2, v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform2fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform2fv", location, v, size, 2))
</span><span class="cx"> return;
</span><span class="lines">@@ -3452,7 +3452,7 @@
</span><span class="cx"> m_context->uniform2fv(location->location(), size / 2, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform2i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform2i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !location)
</span><span class="cx"> return;
</span><span class="lines">@@ -3465,7 +3465,7 @@
</span><span class="cx"> m_context->uniform2i(location->location(), x, y);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, Int32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, Int32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform2iv", location, v, 2))
</span><span class="cx"> return;
</span><span class="lines">@@ -3473,7 +3473,7 @@
</span><span class="cx"> m_context->uniform2iv(location->location(), v.length() / 2, v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform2iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform2iv", location, v, size, 2))
</span><span class="cx"> return;
</span><span class="lines">@@ -3481,7 +3481,7 @@
</span><span class="cx"> m_context->uniform2iv(location->location(), size / 2, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform3f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform3f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !location)
</span><span class="cx"> return;
</span><span class="lines">@@ -3494,7 +3494,7 @@
</span><span class="cx"> m_context->uniform3f(location->location(), x, y, z);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, Float32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, Float32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform3fv", location, v, 3))
</span><span class="cx"> return;
</span><span class="lines">@@ -3502,7 +3502,7 @@
</span><span class="cx"> m_context->uniform3fv(location->location(), v.length() / 3, v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform3fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform3fv", location, v, size, 3))
</span><span class="cx"> return;
</span><span class="lines">@@ -3510,7 +3510,7 @@
</span><span class="cx"> m_context->uniform3fv(location->location(), size / 3, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform3i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform3i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !location)
</span><span class="cx"> return;
</span><span class="lines">@@ -3523,7 +3523,7 @@
</span><span class="cx"> m_context->uniform3i(location->location(), x, y, z);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, Int32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, Int32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform3iv", location, v, 3))
</span><span class="cx"> return;
</span><span class="lines">@@ -3531,7 +3531,7 @@
</span><span class="cx"> m_context->uniform3iv(location->location(), v.length() / 3, v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform3iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform3iv", location, v, size, 3))
</span><span class="cx"> return;
</span><span class="lines">@@ -3539,7 +3539,7 @@
</span><span class="cx"> m_context->uniform3iv(location->location(), size / 3, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform4f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform4f(const WebGLUniformLocation* location, GC3Dfloat x, GC3Dfloat y, GC3Dfloat z, GC3Dfloat w)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !location)
</span><span class="cx"> return;
</span><span class="lines">@@ -3552,7 +3552,7 @@
</span><span class="cx"> m_context->uniform4f(location->location(), x, y, z, w);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, Float32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, Float32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform4fv", location, v, 4))
</span><span class="cx"> return;
</span><span class="lines">@@ -3560,7 +3560,7 @@
</span><span class="cx"> m_context->uniform4fv(location->location(), v.length() / 4, v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform4fv(const WebGLUniformLocation* location, GC3Dfloat* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform4fv", location, v, size, 4))
</span><span class="cx"> return;
</span><span class="lines">@@ -3568,7 +3568,7 @@
</span><span class="cx"> m_context->uniform4fv(location->location(), size / 4, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform4i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform4i(const WebGLUniformLocation* location, GC3Dint x, GC3Dint y, GC3Dint z, GC3Dint w)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !location)
</span><span class="cx"> return;
</span><span class="lines">@@ -3581,7 +3581,7 @@
</span><span class="cx"> m_context->uniform4i(location->location(), x, y, z, w);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, Int32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, Int32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform4iv", location, v, 4))
</span><span class="cx"> return;
</span><span class="lines">@@ -3589,7 +3589,7 @@
</span><span class="cx"> m_context->uniform4iv(location->location(), v.length() / 4, v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniform4iv(const WebGLUniformLocation* location, GC3Dint* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformParameters("uniform4iv", location, v, size, 4))
</span><span class="cx"> return;
</span><span class="lines">@@ -3597,7 +3597,7 @@
</span><span class="cx"> m_context->uniform4iv(location->location(), size / 4, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose, v, 4))
</span><span class="cx"> return;
</span><span class="lines">@@ -3604,7 +3604,7 @@
</span><span class="cx"> m_context->uniformMatrix2fv(location->location(), v.length() / 4, transpose, v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniformMatrix2fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix2fv", location, transpose, v, size, 4))
</span><span class="cx"> return;
</span><span class="lines">@@ -3611,7 +3611,7 @@
</span><span class="cx"> m_context->uniformMatrix2fv(location->location(), size / 4, transpose, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose, v, 9))
</span><span class="cx"> return;
</span><span class="lines">@@ -3618,7 +3618,7 @@
</span><span class="cx"> m_context->uniformMatrix3fv(location->location(), v.length() / 9, transpose, v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniformMatrix3fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix3fv", location, transpose, v, size, 9))
</span><span class="cx"> return;
</span><span class="lines">@@ -3625,7 +3625,7 @@
</span><span class="cx"> m_context->uniformMatrix3fv(location->location(), size / 9, transpose, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, Float32Array& v)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose, v, 16))
</span><span class="cx"> return;
</span><span class="lines">@@ -3632,7 +3632,7 @@
</span><span class="cx"> m_context->uniformMatrix4fv(location->location(), v.length() / 16, transpose, v.data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::uniformMatrix4fv(const WebGLUniformLocation* location, GC3Dboolean transpose, GC3Dfloat* v, GC3Dsizei size)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateUniformMatrixParameters("uniformMatrix4fv", location, transpose, v, size, 16))
</span><span class="cx"> return;
</span><span class="lines">@@ -3639,7 +3639,7 @@
</span><span class="cx"> m_context->uniformMatrix4fv(location->location(), size / 16, transpose, v);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::useProgram(WebGLProgram* program, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::useProgram(WebGLProgram* program)
</ins><span class="cx"> {
</span><span class="cx"> bool deleted;
</span><span class="cx"> if (!checkObjectToBeBound("useProgram", program, deleted))
</span><span class="lines">@@ -3660,7 +3660,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::validateProgram(WebGLProgram* program, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::validateProgram(WebGLProgram* program)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !validateWebGLObject("validateProgram", program))
</span><span class="cx"> return;
</span><span class="lines">@@ -3727,7 +3727,7 @@
</span><span class="cx"> vertexAttribfvImpl("vertexAttrib4fv", index, v, size, 4);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebGLRenderingContextBase::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, long long offset, ExceptionCode&)
</del><ins>+void WebGLRenderingContextBase::vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized, GC3Dsizei stride, long long offset)
</ins><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return;
</span><span class="lines">@@ -4983,15 +4983,13 @@
</span><span class="cx">
</span><span class="cx"> void WebGLRenderingContextBase::restoreCurrentFramebuffer()
</span><span class="cx"> {
</span><del>- ExceptionCode ec;
- bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_framebufferBinding.get(), ec);
</del><ins>+ bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_framebufferBinding.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebGLRenderingContextBase::restoreCurrentTexture2D()
</span><span class="cx"> {
</span><del>- ExceptionCode ec;
</del><span class="cx"> auto texture = m_textureUnits[m_activeTextureUnit].texture2DBinding.get();
</span><del>- bindTexture(GraphicsContext3D::TEXTURE_2D, texture, ec);
</del><ins>+ bindTexture(GraphicsContext3D::TEXTURE_2D, texture);
</ins><span class="cx"> if (texture && texture->needToUseBlackTexture(textureExtensionFlags()))
</span><span class="cx"> m_unrenderableTextureUnits.add(m_activeTextureUnit);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.h (207643 => 207644)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -125,13 +125,13 @@
</span><span class="cx"> int drawingBufferWidth() const;
</span><span class="cx"> int drawingBufferHeight() const;
</span><span class="cx">
</span><del>- 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&);
</del><ins>+ 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*);
</ins><span class="cx"> void blendColor(GC3Dfloat red, GC3Dfloat green, GC3Dfloat blue, GC3Dfloat alpha);
</span><span class="cx"> void blendEquation(GC3Denum mode);
</span><span class="cx"> void blendEquationSeparate(GC3Denum modeRGB, GC3Denum modeAlpha);
</span><span class="lines">@@ -138,11 +138,11 @@
</span><span class="cx"> void blendFunc(GC3Denum sfactor, GC3Denum dfactor);
</span><span class="cx"> void blendFuncSeparate(GC3Denum srcRGB, GC3Denum dstRGB, GC3Denum srcAlpha, GC3Denum dstAlpha);
</span><span class="cx">
</span><del>- 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&);
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> GC3Denum checkFramebufferStatus(GC3Denum target);
</span><span class="cx"> virtual void clear(GC3Dbitfield mask) = 0;
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> void clearDepth(GC3Dfloat);
</span><span class="cx"> void clearStencil(GC3Dint);
</span><span class="cx"> void colorMask(GC3Dboolean red, GC3Dboolean green, GC3Dboolean blue, GC3Dboolean alpha);
</span><del>- void compileShader(WebGLShader*, ExceptionCode&);
</del><ins>+ void compileShader(WebGLShader*);
</ins><span class="cx">
</span><span class="cx"> void compressedTexImage2D(GC3Denum target, GC3Dint level, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height, GC3Dint border, ArrayBufferView& data);
</span><span class="cx"> void compressedTexSubImage2D(GC3Denum target, GC3Dint level, GC3Dint xoffset, GC3Dint yoffset, GC3Dsizei width, GC3Dsizei height, GC3Denum format, ArrayBufferView& data);
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> RefPtr<WebGLFramebuffer> createFramebuffer();
</span><span class="cx"> RefPtr<WebGLProgram> createProgram();
</span><span class="cx"> RefPtr<WebGLRenderbuffer> createRenderbuffer();
</span><del>- RefPtr<WebGLShader> createShader(GC3Denum type, ExceptionCode&);
</del><ins>+ RefPtr<WebGLShader> createShader(GC3Denum type);
</ins><span class="cx"> RefPtr<WebGLTexture> createTexture();
</span><span class="cx">
</span><span class="cx"> void cullFace(GC3Denum mode);
</span><span class="lines">@@ -177,43 +177,43 @@
</span><span class="cx"> void depthFunc(GC3Denum);
</span><span class="cx"> void depthMask(GC3Dboolean);
</span><span class="cx"> void depthRange(GC3Dfloat zNear, GC3Dfloat zFar);
</span><del>- void detachShader(WebGLProgram*, WebGLShader*, ExceptionCode&);
</del><ins>+ void detachShader(WebGLProgram*, WebGLShader*);
</ins><span class="cx"> void disable(GC3Denum cap);
</span><del>- 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&);
</del><ins>+ void disableVertexAttribArray(GC3Duint index);
+ void drawArrays(GC3Denum mode, GC3Dint first, GC3Dsizei count);
+ void drawElements(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset);
</ins><span class="cx">
</span><span class="cx"> void enable(GC3Denum cap);
</span><del>- void enableVertexAttribArray(GC3Duint index, ExceptionCode&);
</del><ins>+ void enableVertexAttribArray(GC3Duint index);
</ins><span class="cx"> void finish();
</span><span class="cx"> void flush();
</span><del>- void framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer*, ExceptionCode&);
- void framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture*, GC3Dint level, ExceptionCode&);
</del><ins>+ void framebufferRenderbuffer(GC3Denum target, GC3Denum attachment, GC3Denum renderbuffertarget, WebGLRenderbuffer*);
+ void framebufferTexture2D(GC3Denum target, GC3Denum attachment, GC3Denum textarget, WebGLTexture*, GC3Dint level);
</ins><span class="cx"> void frontFace(GC3Denum mode);
</span><span class="cx"> void generateMipmap(GC3Denum target);
</span><span class="cx">
</span><del>- RefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GC3Duint index, ExceptionCode&);
- RefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GC3Duint index, ExceptionCode&);
- bool getAttachedShaders(WebGLProgram*, Vector<RefPtr<WebGLShader>>&, ExceptionCode&);
</del><ins>+ RefPtr<WebGLActiveInfo> getActiveAttrib(WebGLProgram*, GC3Duint index);
+ RefPtr<WebGLActiveInfo> getActiveUniform(WebGLProgram*, GC3Duint index);
+ bool getAttachedShaders(WebGLProgram*, Vector<RefPtr<WebGLShader>>&);
</ins><span class="cx"> GC3Dint getAttribLocation(WebGLProgram*, const String& name);
</span><del>- WebGLGetInfo getBufferParameter(GC3Denum target, GC3Denum pname, ExceptionCode&);
</del><ins>+ WebGLGetInfo getBufferParameter(GC3Denum target, GC3Denum pname);
</ins><span class="cx"> RefPtr<WebGLContextAttributes> getContextAttributes();
</span><span class="cx"> GC3Denum getError();
</span><span class="cx"> virtual WebGLExtension* getExtension(const String& name) = 0;
</span><span class="cx"> virtual WebGLGetInfo getFramebufferAttachmentParameter(GC3Denum target, GC3Denum attachment, GC3Denum pname, ExceptionCode&) = 0;
</span><span class="cx"> virtual WebGLGetInfo getParameter(GC3Denum pname, ExceptionCode&) = 0;
</span><del>- 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&);
</del><ins>+ 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*);
</ins><span class="cx"> virtual Vector<String> getSupportedExtensions() = 0;
</span><del>- 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&);
</del><ins>+ WebGLGetInfo getTexParameter(GC3Denum target, GC3Denum pname);
+ WebGLGetInfo getUniform(WebGLProgram*, const WebGLUniformLocation*);
+ RefPtr<WebGLUniformLocation> getUniformLocation(WebGLProgram*, const String&);
+ WebGLGetInfo getVertexAttrib(GC3Duint index, GC3Denum pname);
</ins><span class="cx"> long long getVertexAttribOffset(GC3Duint index, GC3Denum pname);
</span><span class="cx">
</span><span class="cx"> virtual void hint(GC3Denum target, GC3Denum mode) = 0;
</span><span class="lines">@@ -227,15 +227,15 @@
</span><span class="cx"> GC3Dboolean isTexture(WebGLTexture*);
</span><span class="cx">
</span><span class="cx"> void lineWidth(GC3Dfloat);
</span><del>- void linkProgram(WebGLProgram*, ExceptionCode&);
</del><ins>+ void linkProgram(WebGLProgram*);
</ins><span class="cx"> void pixelStorei(GC3Denum pname, GC3Dint param);
</span><span class="cx"> void polygonOffset(GC3Dfloat factor, GC3Dfloat units);
</span><del>- void readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels, ExceptionCode&);
</del><ins>+ void readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, ArrayBufferView& pixels);
</ins><span class="cx"> void releaseShaderCompiler();
</span><span class="cx"> virtual void renderbufferStorage(GC3Denum target, GC3Denum internalformat, GC3Dsizei width, GC3Dsizei height) = 0;
</span><span class="cx"> void sampleCoverage(GC3Dfloat value, GC3Dboolean invert);
</span><span class="cx"> void scissor(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);
</span><del>- void shaderSource(WebGLShader*, const String&, ExceptionCode&);
</del><ins>+ void shaderSource(WebGLShader*, const String&);
</ins><span class="cx"> void stencilFunc(GC3Denum func, GC3Dint ref, GC3Duint mask);
</span><span class="cx"> void stencilFuncSeparate(GC3Denum face, GC3Denum func, GC3Dint ref, GC3Duint mask);
</span><span class="cx"> void stencilMask(GC3Duint);
</span><span class="lines">@@ -274,39 +274,39 @@
</span><span class="cx"> GC3Denum format, GC3Denum type, HTMLVideoElement*, ExceptionCode&) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- 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&);
</del><ins>+ 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);
</ins><span class="cx">
</span><del>- void useProgram(WebGLProgram*, ExceptionCode&);
- void validateProgram(WebGLProgram*, ExceptionCode&);
</del><ins>+ void useProgram(WebGLProgram*);
+ void validateProgram(WebGLProgram*);
</ins><span class="cx">
</span><span class="cx"> void vertexAttrib1f(GC3Duint index, GC3Dfloat x);
</span><span class="cx"> void vertexAttrib1fv(GC3Duint index, Float32Array& values);
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> void vertexAttrib4fv(GC3Duint index, Float32Array& values);
</span><span class="cx"> void vertexAttrib4fv(GC3Duint index, GC3Dfloat* values, GC3Dsizei size);
</span><span class="cx"> void vertexAttribPointer(GC3Duint index, GC3Dint size, GC3Denum type, GC3Dboolean normalized,
</span><del>- GC3Dsizei stride, long long offset, ExceptionCode&);
</del><ins>+ GC3Dsizei stride, long long offset);
</ins><span class="cx">
</span><span class="cx"> void viewport(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height);
</span><span class="cx">
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> RefPtr<Image> drawImageIntoBuffer(Image&, int width, int height, int deviceScaleFactor);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><del>- RefPtr<Image> videoFrameToImage(HTMLVideoElement*, BackingStoreCopy, ExceptionCode&);
</del><ins>+ RefPtr<Image> videoFrameToImage(HTMLVideoElement*, BackingStoreCopy);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WebGLTexture::TextureExtensionFlag textureExtensionFlags() const;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBaseidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.idl (207643 => 207644)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -472,23 +472,23 @@
</span><span class="cx"> readonly attribute GLsizei drawingBufferWidth;
</span><span class="cx"> readonly attribute GLsizei drawingBufferHeight;
</span><span class="cx">
</span><del>- [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);
</del><ins>+ 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);
</ins><span class="cx"> void blendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
</span><span class="cx"> void blendEquation(GLenum mode);
</span><span class="cx"> void blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
</span><span class="cx"> void blendFunc(GLenum sfactor, GLenum dfactor);
</span><span class="cx"> void blendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
</span><del>- [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);
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> GLenum checkFramebufferStatus(GLenum target);
</span><span class="cx"> void clear(GLbitfield mask);
</span><span class="lines">@@ -496,12 +496,12 @@
</span><span class="cx"> void clearDepth(GLclampf depth);
</span><span class="cx"> void clearStencil(GLint s);
</span><span class="cx"> void colorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
</span><del>- [MayThrowLegacyException] void compileShader(WebGLShader? shader);
</del><ins>+ void compileShader(WebGLShader? shader);
</ins><span class="cx">
</span><span class="cx"> void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
</span><span class="cx"> GLsizei width, GLsizei height, GLint border, ArrayBufferView data);
</span><span class="cx"> void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
</span><del>- GLsizei width, GLsizei height, GLenum format, ArrayBufferView data);
</del><ins>+ GLsizei width, GLsizei height, GLenum format, ArrayBufferView data);
</ins><span class="cx">
</span><span class="cx"> void copyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
</span><span class="cx"> void copyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
</span><span class="lines">@@ -510,7 +510,7 @@
</span><span class="cx"> WebGLFramebuffer createFramebuffer();
</span><span class="cx"> WebGLProgram createProgram();
</span><span class="cx"> WebGLRenderbuffer createRenderbuffer();
</span><del>- [MayThrowLegacyException] WebGLShader createShader(GLenum type);
</del><ins>+ WebGLShader createShader(GLenum type);
</ins><span class="cx"> WebGLTexture createTexture();
</span><span class="cx">
</span><span class="cx"> void cullFace(GLenum mode);
</span><span class="lines">@@ -525,23 +525,23 @@
</span><span class="cx"> void depthFunc(GLenum func);
</span><span class="cx"> void depthMask(GLboolean flag);
</span><span class="cx"> void depthRange(GLclampf zNear, GLclampf zFar);
</span><del>- [MayThrowLegacyException] void detachShader(WebGLProgram? program, WebGLShader? shader);
</del><ins>+ void detachShader(WebGLProgram? program, WebGLShader? shader);
</ins><span class="cx"> void disable(GLenum cap);
</span><del>- [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);
</del><ins>+ void disableVertexAttribArray(GLuint index);
+ void drawArrays(GLenum mode, GLint first, GLsizei count);
+ void drawElements(GLenum mode, GLsizei count, GLenum type, GLintptr offset);
</ins><span class="cx">
</span><span class="cx"> void enable(GLenum cap);
</span><del>- [MayThrowLegacyException] void enableVertexAttribArray(GLuint index);
</del><ins>+ void enableVertexAttribArray(GLuint index);
</ins><span class="cx"> void finish();
</span><span class="cx"> void flush();
</span><del>- [MayThrowLegacyException] void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, WebGLRenderbuffer? renderbuffer);
- [MayThrowLegacyException] void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, WebGLTexture? texture, GLint level);
</del><ins>+ void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, WebGLRenderbuffer? renderbuffer);
+ void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, WebGLTexture? texture, GLint level);
</ins><span class="cx"> void frontFace(GLenum mode);
</span><span class="cx"> void generateMipmap(GLenum target);
</span><span class="cx">
</span><del>- [MayThrowLegacyException] WebGLActiveInfo getActiveAttrib(WebGLProgram? program, GLuint index);
- [MayThrowLegacyException] WebGLActiveInfo getActiveUniform(WebGLProgram? program, GLuint index);
</del><ins>+ WebGLActiveInfo getActiveAttrib(WebGLProgram? program, GLuint index);
+ WebGLActiveInfo getActiveUniform(WebGLProgram? program, GLuint index);
</ins><span class="cx">
</span><span class="cx"> [Custom, MayThrowLegacyException] void getAttachedShaders(WebGLProgram? program);
</span><span class="cx">
</span><span class="lines">@@ -559,15 +559,15 @@
</span><span class="cx"> [Custom, MayThrowLegacyException] any getFramebufferAttachmentParameter(GLenum target, GLenum attachment, GLenum pname);
</span><span class="cx"> [Custom, MayThrowLegacyException] any getParameter(GLenum pname);
</span><span class="cx"> [Custom, MayThrowLegacyException] any getProgramParameter(WebGLProgram? program, GLenum pname);
</span><del>- [MayThrowLegacyException] DOMString? getProgramInfoLog(WebGLProgram? program);
</del><ins>+ DOMString? getProgramInfoLog(WebGLProgram? program);
</ins><span class="cx"> [Custom, MayThrowLegacyException] any getRenderbufferParameter(GLenum target, GLenum pname);
</span><span class="cx"> [Custom, MayThrowLegacyException] any getShaderParameter(WebGLShader? shader, GLenum pname);
</span><span class="cx">
</span><del>- [MayThrowLegacyException] DOMString? getShaderInfoLog(WebGLShader? shader);
</del><ins>+ DOMString? getShaderInfoLog(WebGLShader? shader);
</ins><span class="cx">
</span><del>- [MayThrowLegacyException] WebGLShaderPrecisionFormat getShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype);
</del><ins>+ WebGLShaderPrecisionFormat getShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype);
</ins><span class="cx">
</span><del>- [MayThrowLegacyException] DOMString? getShaderSource(WebGLShader? shader);
</del><ins>+ DOMString? getShaderSource(WebGLShader? shader);
</ins><span class="cx">
</span><span class="cx"> [Custom] sequence<DOMString> getSupportedExtensions();
</span><span class="cx">
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx">
</span><span class="cx"> [Custom, MayThrowLegacyException] any getUniform(WebGLProgram? program, WebGLUniformLocation? location);
</span><span class="cx">
</span><del>- [MayThrowLegacyException] WebGLUniformLocation getUniformLocation(WebGLProgram? program, DOMString name);
</del><ins>+ WebGLUniformLocation getUniformLocation(WebGLProgram? program, DOMString name);
</ins><span class="cx">
</span><span class="cx"> [Custom, MayThrowLegacyException] any getVertexAttrib(GLuint index, GLenum pname);
</span><span class="cx">
</span><span class="lines">@@ -591,17 +591,17 @@
</span><span class="cx"> GLboolean isShader(WebGLShader? shader);
</span><span class="cx"> GLboolean isTexture(WebGLTexture? texture);
</span><span class="cx"> void lineWidth(GLfloat width);
</span><del>- [MayThrowLegacyException] void linkProgram(WebGLProgram? program);
</del><ins>+ void linkProgram(WebGLProgram? program);
</ins><span class="cx"> void pixelStorei(GLenum pname, GLint param);
</span><span class="cx"> void polygonOffset(GLfloat factor, GLfloat units);
</span><span class="cx">
</span><del>- [MayThrowLegacyException] void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView pixels);
</del><ins>+ void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView pixels);
</ins><span class="cx">
</span><span class="cx"> void releaseShaderCompiler();
</span><span class="cx"> void renderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
</span><span class="cx"> void sampleCoverage(GLclampf value, GLboolean invert);
</span><span class="cx"> void scissor(GLint x, GLint y, GLsizei width, GLsizei height);
</span><del>- [MayThrowLegacyException] void shaderSource(WebGLShader? shader, DOMString string);
</del><ins>+ void shaderSource(WebGLShader? shader, DOMString string);
</ins><span class="cx"> void stencilFunc(GLenum func, GLint ref, GLuint mask);
</span><span class="cx"> void stencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
</span><span class="cx"> void stencilMask(GLuint mask);
</span><span class="lines">@@ -640,21 +640,21 @@
</span><span class="cx"> GLenum format, GLenum type, HTMLVideoElement? video);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- [MayThrowLegacyException] void uniform1f(WebGLUniformLocation? location, GLfloat x);
</del><ins>+ void uniform1f(WebGLUniformLocation? location, GLfloat x);
</ins><span class="cx"> [Custom, MayThrowLegacyException] void uniform1fv(WebGLUniformLocation? location, Float32Array v);
</span><del>- [MayThrowLegacyException] void uniform1i(WebGLUniformLocation? location, GLint x);
</del><ins>+ void uniform1i(WebGLUniformLocation? location, GLint x);
</ins><span class="cx"> [Custom, MayThrowLegacyException] void uniform1iv(WebGLUniformLocation? location, Int32Array v);
</span><del>- [MayThrowLegacyException] void uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y);
</del><ins>+ void uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y);
</ins><span class="cx"> [Custom, MayThrowLegacyException] void uniform2fv(WebGLUniformLocation? location, Float32Array v);
</span><del>- [MayThrowLegacyException] void uniform2i(WebGLUniformLocation? location, GLint x, GLint y);
</del><ins>+ void uniform2i(WebGLUniformLocation? location, GLint x, GLint y);
</ins><span class="cx"> [Custom, MayThrowLegacyException] void uniform2iv(WebGLUniformLocation? location, Int32Array v);
</span><del>- [MayThrowLegacyException] void uniform3f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z);
</del><ins>+ void uniform3f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z);
</ins><span class="cx"> [Custom, MayThrowLegacyException] void uniform3fv(WebGLUniformLocation? location, Float32Array v);
</span><del>- [MayThrowLegacyException] void uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z);
</del><ins>+ void uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z);
</ins><span class="cx"> [Custom, MayThrowLegacyException] void uniform3iv(WebGLUniformLocation? location, Int32Array v);
</span><del>- [MayThrowLegacyException] void uniform4f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
</del><ins>+ void uniform4f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
</ins><span class="cx"> [Custom, MayThrowLegacyException] void uniform4fv(WebGLUniformLocation? location, Float32Array v);
</span><del>- [MayThrowLegacyException] void uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w);
</del><ins>+ void uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w);
</ins><span class="cx"> [Custom, MayThrowLegacyException] void uniform4iv(WebGLUniformLocation? location, Int32Array v);
</span><span class="cx">
</span><span class="cx"> [Custom, MayThrowLegacyException] void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array);
</span><span class="lines">@@ -661,8 +661,8 @@
</span><span class="cx"> [Custom, MayThrowLegacyException] void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array);
</span><span class="cx"> [Custom, MayThrowLegacyException] void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array array);
</span><span class="cx">
</span><del>- [MayThrowLegacyException] void useProgram(WebGLProgram? program);
- [MayThrowLegacyException] void validateProgram(WebGLProgram? program);
</del><ins>+ void useProgram(WebGLProgram? program);
+ void validateProgram(WebGLProgram? program);
</ins><span class="cx">
</span><span class="cx"> void vertexAttrib1f(GLuint indx, GLfloat x);
</span><span class="cx"> [Custom] void vertexAttrib1fv(GLuint indx, Float32Array values);
</span><span class="lines">@@ -672,7 +672,7 @@
</span><span class="cx"> [Custom] void vertexAttrib3fv(GLuint indx, Float32Array values);
</span><span class="cx"> void vertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
</span><span class="cx"> [Custom] void vertexAttrib4fv(GLuint indx, Float32Array values);
</span><del>- [MayThrowLegacyException] void vertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
</del><ins>+ void vertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
</ins><span class="cx">
</span><span class="cx"> void viewport(GLint x, GLint y, GLsizei width, GLsizei height);
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>