Changeset 269768 in webkit

Timestamp:

Nov 13, 2020 1:53:03 AM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Remove uses of MakeCurrent from WebGL implementation
​https://bugs.webkit.org/show_bug.cgi?id=218178
<rdar://problem/70714561>

Patch by Kimmo Kinnunen <​kkinnunen@apple.com> on 2020-11-13
Reviewed by Dean Jackson.

Work towards WebGL implementation which uses
GraphicsContextGL abstract base class instead of
GraphicsContextGLOpenGL concrete class.

Move GraphicsContextGLOpenGL::makeContextCurrent() to
private section, as it is an implementation detail of
the class. The function is intended to be called at the
start of all public functions that might call into OpenGL
to ensure that OpenGL uses the right context.

Check all return values of makeCurrentContext(). We
should not call into OpenGL if the context is not current,
as that can lead to corruption, crashes or incorrect results.
Add a compile-time warning if the return value is not used.
Non-EWS compiled flavors of GraphicsContextGLOpenGL are changed
only in best effort manner.

Ensure that all functions actually call the makeCurrentContext()
function before calling into OpenGL. Non-ANGLE flavors of
GraphicsContextGLOpenGL are ensured only in best effort manner.

ANGLE flavor of GraphicsContextGLOpenGL function implementations
should call directly the ANGLE functions instead of calling them
through getExtensions() interface. There is no conditional code
inside and the implementation knows exactly which function to
call in all situations. There is no abstraction between
GraphicsContextGLOpenGL and ExtensionsGL, rather they are
in practice the same object currently, semi-artificially split to
two. This is true of other flavors of GraphicsContextGLOpenGL,
but those are left unchanged in this regard.

No new tests, a refactor.

• html/canvas/WebGLRenderingContextBase.cpp:

(WebCore::WebGLRenderingContextBase::create):
(WebCore::WebGLRenderingContextBase::initializeNewContext):
(WebCore::WebGLRenderingContextBase::validateElementArraySize):
(WebCore::WebGLRenderingContextBase::validateIndexArrayPrecise):
(WebCore::WebGLRenderingContextBase::validateDrawElements):
(WebCore::WebGLRenderingContextBase::readPixels):
(WebCore::WebGLRenderingContextBase::vertexAttribfvImpl):
(WebCore::WebGLRenderingContextBase::initVertexAttrib0):

• platform/graphics/angle/ExtensionsGLANGLE.cpp:

(WebCore::ExtensionsGLANGLE::supports):
(WebCore::ExtensionsGLANGLE::ensureEnabled):
(WebCore::ExtensionsGLANGLE::getTranslatedShaderSourceANGLE):
(WebCore::ExtensionsGLANGLE::blitFramebuffer):
(WebCore::ExtensionsGLANGLE::renderbufferStorageMultisample):
(WebCore::ExtensionsGLANGLE::createVertexArrayOES):
(WebCore::ExtensionsGLANGLE::deleteVertexArrayOES):
(WebCore::ExtensionsGLANGLE::isVertexArrayOES):
(WebCore::ExtensionsGLANGLE::bindVertexArrayOES):
(WebCore::ExtensionsGLANGLE::drawBuffersEXT):
(WebCore::ExtensionsGLANGLE::drawArraysInstanced):
(WebCore::ExtensionsGLANGLE::drawElementsInstanced):
(WebCore::ExtensionsGLANGLE::vertexAttribDivisor):
(WebCore::ExtensionsGLANGLE::getBooleanvRobustANGLE):
(WebCore::ExtensionsGLANGLE::getBufferParameterivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getFloatvRobustANGLE):
(WebCore::ExtensionsGLANGLE::getFramebufferAttachmentParameterivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getIntegervRobustANGLE):
(WebCore::ExtensionsGLANGLE::getProgramivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getRenderbufferParameterivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getShaderivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getTexParameterfvRobustANGLE):
(WebCore::ExtensionsGLANGLE::getTexParameterivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getUniformfvRobustANGLE):
(WebCore::ExtensionsGLANGLE::getUniformivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getVertexAttribfvRobustANGLE):
(WebCore::ExtensionsGLANGLE::getVertexAttribivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getVertexAttribPointervRobustANGLE):
(WebCore::ExtensionsGLANGLE::readPixelsRobustANGLE):
(WebCore::ExtensionsGLANGLE::texImage2DRobustANGLE):
(WebCore::ExtensionsGLANGLE::texParameterfvRobustANGLE):
(WebCore::ExtensionsGLANGLE::texParameterivRobustANGLE):
(WebCore::ExtensionsGLANGLE::texSubImage2DRobustANGLE):
(WebCore::ExtensionsGLANGLE::compressedTexImage2DRobustANGLE):
(WebCore::ExtensionsGLANGLE::compressedTexSubImage2DRobustANGLE):
(WebCore::ExtensionsGLANGLE::compressedTexImage3DRobustANGLE):
(WebCore::ExtensionsGLANGLE::compressedTexSubImage3DRobustANGLE):
(WebCore::ExtensionsGLANGLE::texImage3DRobustANGLE):
(WebCore::ExtensionsGLANGLE::texSubImage3DRobustANGLE):
(WebCore::ExtensionsGLANGLE::getQueryivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getQueryObjectuivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getBufferPointervRobustANGLE):
(WebCore::ExtensionsGLANGLE::getIntegeri_vRobustANGLE):
(WebCore::ExtensionsGLANGLE::getInternalformativRobustANGLE):
(WebCore::ExtensionsGLANGLE::getVertexAttribIivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getVertexAttribIuivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getUniformuivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getActiveUniformBlockivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getInteger64vRobustANGLE):
(WebCore::ExtensionsGLANGLE::getInteger64i_vRobustANGLE):
(WebCore::ExtensionsGLANGLE::getBufferParameteri64vRobustANGLE):
(WebCore::ExtensionsGLANGLE::samplerParameterivRobustANGLE):
(WebCore::ExtensionsGLANGLE::samplerParameterfvRobustANGLE):
(WebCore::ExtensionsGLANGLE::getSamplerParameterivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getSamplerParameterfvRobustANGLE):
(WebCore::ExtensionsGLANGLE::getFramebufferParameterivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getProgramInterfaceivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getBooleani_vRobustANGLE):
(WebCore::ExtensionsGLANGLE::getMultisamplefvRobustANGLE):
(WebCore::ExtensionsGLANGLE::getTexLevelParameterivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getTexLevelParameterfvRobustANGLE):
(WebCore::ExtensionsGLANGLE::getPointervRobustANGLERobustANGLE):
(WebCore::ExtensionsGLANGLE::readnPixelsRobustANGLE):
(WebCore::ExtensionsGLANGLE::getnUniformfvRobustANGLE):
(WebCore::ExtensionsGLANGLE::getnUniformivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getnUniformuivRobustANGLE):
(WebCore::ExtensionsGLANGLE::texParameterIivRobustANGLE):
(WebCore::ExtensionsGLANGLE::texParameterIuivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getTexParameterIivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getTexParameterIuivRobustANGLE):
(WebCore::ExtensionsGLANGLE::samplerParameterIivRobustANGLE):
(WebCore::ExtensionsGLANGLE::samplerParameterIuivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getSamplerParameterIivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getSamplerParameterIuivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getQueryObjectivRobustANGLE):
(WebCore::ExtensionsGLANGLE::getQueryObjecti64vRobustANGLE):
(WebCore::ExtensionsGLANGLE::getQueryObjectui64vRobustANGLE):

• platform/graphics/angle/GraphicsContextGLANGLE.cpp:

(WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
(WebCore::GraphicsContextGLOpenGL::renderbufferStorage):
(WebCore::GraphicsContextGLOpenGL::getIntegerv):
(WebCore::GraphicsContextGLOpenGL::getIntegeri_v):
(WebCore::GraphicsContextGLOpenGL::getShaderPrecisionFormat):
(WebCore::GraphicsContextGLOpenGL::depthRange):
(WebCore::GraphicsContextGLOpenGL::clearDepth):
(WebCore::GraphicsContextGLOpenGL::readPixels):
(WebCore::GraphicsContextGLOpenGL::prepareTexture):
(WebCore::GraphicsContextGLOpenGL::readRenderingResults):
(WebCore::GraphicsContextGLOpenGL::reshape):
(WebCore::GraphicsContextGLOpenGL::activeTexture):
(WebCore::GraphicsContextGLOpenGL::attachShader):
(WebCore::GraphicsContextGLOpenGL::bindAttribLocation):
(WebCore::GraphicsContextGLOpenGL::bindBuffer):
(WebCore::GraphicsContextGLOpenGL::bindFramebuffer):
(WebCore::GraphicsContextGLOpenGL::bindRenderbuffer):
(WebCore::GraphicsContextGLOpenGL::bindTexture):
(WebCore::GraphicsContextGLOpenGL::blendColor):
(WebCore::GraphicsContextGLOpenGL::blendEquation):
(WebCore::GraphicsContextGLOpenGL::blendEquationSeparate):
(WebCore::GraphicsContextGLOpenGL::blendFunc):
(WebCore::GraphicsContextGLOpenGL::blendFuncSeparate):
(WebCore::GraphicsContextGLOpenGL::bufferData):
(WebCore::GraphicsContextGLOpenGL::bufferSubData):
(WebCore::GraphicsContextGLOpenGL::mapBufferRange):
(WebCore::GraphicsContextGLOpenGL::unmapBuffer):
(WebCore::GraphicsContextGLOpenGL::copyBufferSubData):
(WebCore::GraphicsContextGLOpenGL::getInternalformativ):
(WebCore::GraphicsContextGLOpenGL::renderbufferStorageMultisample):
(WebCore::GraphicsContextGLOpenGL::texStorage2D):
(WebCore::GraphicsContextGLOpenGL::texStorage3D):
(WebCore::GraphicsContextGLOpenGL::getActiveUniforms):
(WebCore::GraphicsContextGLOpenGL::checkFramebufferStatus):
(WebCore::GraphicsContextGLOpenGL::clearColor):
(WebCore::GraphicsContextGLOpenGL::clear):
(WebCore::GraphicsContextGLOpenGL::clearStencil):
(WebCore::GraphicsContextGLOpenGL::colorMask):
(WebCore::GraphicsContextGLOpenGL::compileShader):
(WebCore::GraphicsContextGLOpenGL::compileShaderDirect):
(WebCore::GraphicsContextGLOpenGL::copyTexImage2D):
(WebCore::GraphicsContextGLOpenGL::copyTexSubImage2D):
(WebCore::GraphicsContextGLOpenGL::cullFace):
(WebCore::GraphicsContextGLOpenGL::depthFunc):
(WebCore::GraphicsContextGLOpenGL::depthMask):
(WebCore::GraphicsContextGLOpenGL::detachShader):
(WebCore::GraphicsContextGLOpenGL::disable):
(WebCore::GraphicsContextGLOpenGL::disableVertexAttribArray):
(WebCore::GraphicsContextGLOpenGL::drawArrays):
(WebCore::GraphicsContextGLOpenGL::drawElements):
(WebCore::GraphicsContextGLOpenGL::enable):
(WebCore::GraphicsContextGLOpenGL::enableVertexAttribArray):
(WebCore::GraphicsContextGLOpenGL::finish):
(WebCore::GraphicsContextGLOpenGL::flush):
(WebCore::GraphicsContextGLOpenGL::framebufferRenderbuffer):
(WebCore::GraphicsContextGLOpenGL::framebufferTexture2D):
(WebCore::GraphicsContextGLOpenGL::frontFace):
(WebCore::GraphicsContextGLOpenGL::generateMipmap):
(WebCore::GraphicsContextGLOpenGL::getActiveAttribImpl):
(WebCore::GraphicsContextGLOpenGL::getActiveUniformImpl):
(WebCore::GraphicsContextGLOpenGL::getAttachedShaders):
(WebCore::GraphicsContextGLOpenGL::getAttribLocation):
(WebCore::GraphicsContextGLOpenGL::moveErrorsToSyntheticErrorList):
(WebCore::GraphicsContextGLOpenGL::getError):
(WebCore::GraphicsContextGLOpenGL::getString):
(WebCore::GraphicsContextGLOpenGL::hint):
(WebCore::GraphicsContextGLOpenGL::isBuffer):
(WebCore::GraphicsContextGLOpenGL::isEnabled):
(WebCore::GraphicsContextGLOpenGL::isFramebuffer):
(WebCore::GraphicsContextGLOpenGL::isProgram):
(WebCore::GraphicsContextGLOpenGL::isRenderbuffer):
(WebCore::GraphicsContextGLOpenGL::isShader):
(WebCore::GraphicsContextGLOpenGL::isTexture):
(WebCore::GraphicsContextGLOpenGL::lineWidth):
(WebCore::GraphicsContextGLOpenGL::linkProgram):
(WebCore::GraphicsContextGLOpenGL::pixelStorei):
(WebCore::GraphicsContextGLOpenGL::polygonOffset):
(WebCore::GraphicsContextGLOpenGL::sampleCoverage):
(WebCore::GraphicsContextGLOpenGL::scissor):
(WebCore::GraphicsContextGLOpenGL::shaderSource):
(WebCore::GraphicsContextGLOpenGL::stencilFunc):
(WebCore::GraphicsContextGLOpenGL::stencilFuncSeparate):
(WebCore::GraphicsContextGLOpenGL::stencilMask):
(WebCore::GraphicsContextGLOpenGL::stencilMaskSeparate):
(WebCore::GraphicsContextGLOpenGL::stencilOp):
(WebCore::GraphicsContextGLOpenGL::stencilOpSeparate):
(WebCore::GraphicsContextGLOpenGL::texParameterf):
(WebCore::GraphicsContextGLOpenGL::texParameteri):
(WebCore::GraphicsContextGLOpenGL::uniform1f):
(WebCore::GraphicsContextGLOpenGL::uniform1fv):
(WebCore::GraphicsContextGLOpenGL::uniform2f):
(WebCore::GraphicsContextGLOpenGL::uniform2fv):
(WebCore::GraphicsContextGLOpenGL::uniform3f):
(WebCore::GraphicsContextGLOpenGL::uniform3fv):
(WebCore::GraphicsContextGLOpenGL::uniform4f):
(WebCore::GraphicsContextGLOpenGL::uniform4fv):
(WebCore::GraphicsContextGLOpenGL::uniform1i):
(WebCore::GraphicsContextGLOpenGL::uniform1iv):
(WebCore::GraphicsContextGLOpenGL::uniform2i):
(WebCore::GraphicsContextGLOpenGL::uniform2iv):
(WebCore::GraphicsContextGLOpenGL::uniform3i):
(WebCore::GraphicsContextGLOpenGL::uniform3iv):
(WebCore::GraphicsContextGLOpenGL::uniform4i):
(WebCore::GraphicsContextGLOpenGL::uniform4iv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix2fv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix3fv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix4fv):
(WebCore::GraphicsContextGLOpenGL::useProgram):
(WebCore::GraphicsContextGLOpenGL::validateProgram):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib1f):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib1fv):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib2f):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib2fv):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib3f):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib3fv):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib4f):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib4fv):
(WebCore::GraphicsContextGLOpenGL::vertexAttribPointer):
(WebCore::GraphicsContextGLOpenGL::vertexAttribIPointer):
(WebCore::GraphicsContextGLOpenGL::viewport):
(WebCore::GraphicsContextGLOpenGL::createVertexArray):
(WebCore::GraphicsContextGLOpenGL::deleteVertexArray):
(WebCore::GraphicsContextGLOpenGL::isVertexArray):
(WebCore::GraphicsContextGLOpenGL::bindVertexArray):
(WebCore::GraphicsContextGLOpenGL::getBooleanv):
(WebCore::GraphicsContextGLOpenGL::getBufferParameteriv):
(WebCore::GraphicsContextGLOpenGL::getFloatv):
(WebCore::GraphicsContextGLOpenGL::getInteger64v):
(WebCore::GraphicsContextGLOpenGL::getInteger64i_v):
(WebCore::GraphicsContextGLOpenGL::getFramebufferAttachmentParameteriv):
(WebCore::GraphicsContextGLOpenGL::getProgramiv):
(WebCore::GraphicsContextGLOpenGL::getProgramInfoLog):
(WebCore::GraphicsContextGLOpenGL::getRenderbufferParameteriv):
(WebCore::GraphicsContextGLOpenGL::getShaderiv):
(WebCore::GraphicsContextGLOpenGL::getShaderInfoLog):
(WebCore::GraphicsContextGLOpenGL::getTexParameterfv):
(WebCore::GraphicsContextGLOpenGL::getTexParameteriv):
(WebCore::GraphicsContextGLOpenGL::getUniformfv):
(WebCore::GraphicsContextGLOpenGL::getUniformiv):
(WebCore::GraphicsContextGLOpenGL::getUniformuiv):
(WebCore::GraphicsContextGLOpenGL::getUniformLocation):
(WebCore::GraphicsContextGLOpenGL::getVertexAttribfv):
(WebCore::GraphicsContextGLOpenGL::getVertexAttribiv):
(WebCore::GraphicsContextGLOpenGL::getVertexAttribOffset):
(WebCore::GraphicsContextGLOpenGL::texSubImage2D):
(WebCore::GraphicsContextGLOpenGL::compressedTexImage2D):
(WebCore::GraphicsContextGLOpenGL::compressedTexSubImage2D):
(WebCore::GraphicsContextGLOpenGL::createBuffer):
(WebCore::GraphicsContextGLOpenGL::createFramebuffer):
(WebCore::GraphicsContextGLOpenGL::createProgram):
(WebCore::GraphicsContextGLOpenGL::createRenderbuffer):
(WebCore::GraphicsContextGLOpenGL::createShader):
(WebCore::GraphicsContextGLOpenGL::createTexture):
(WebCore::GraphicsContextGLOpenGL::deleteBuffer):
(WebCore::GraphicsContextGLOpenGL::deleteFramebuffer):
(WebCore::GraphicsContextGLOpenGL::deleteProgram):
(WebCore::GraphicsContextGLOpenGL::deleteRenderbuffer):
(WebCore::GraphicsContextGLOpenGL::deleteShader):
(WebCore::GraphicsContextGLOpenGL::deleteTexture):
(WebCore::GraphicsContextGLOpenGL::texImage2DDirect):
(WebCore::GraphicsContextGLOpenGL::drawArraysInstanced):
(WebCore::GraphicsContextGLOpenGL::drawElementsInstanced):
(WebCore::GraphicsContextGLOpenGL::vertexAttribDivisor):
(WebCore::GraphicsContextGLOpenGL::getUniformBlockIndex):
(WebCore::GraphicsContextGLOpenGL::getActiveUniformBlockName):
(WebCore::GraphicsContextGLOpenGL::uniformBlockBinding):
(WebCore::GraphicsContextGLOpenGL::createQuery):
(WebCore::GraphicsContextGLOpenGL::beginQuery):
(WebCore::GraphicsContextGLOpenGL::endQuery):
(WebCore::GraphicsContextGLOpenGL::getQueryObjectuiv):
(WebCore::GraphicsContextGLOpenGL::createTransformFeedback):
(WebCore::GraphicsContextGLOpenGL::deleteTransformFeedback):
(WebCore::GraphicsContextGLOpenGL::isTransformFeedback):
(WebCore::GraphicsContextGLOpenGL::bindTransformFeedback):
(WebCore::GraphicsContextGLOpenGL::beginTransformFeedback):
(WebCore::GraphicsContextGLOpenGL::endTransformFeedback):
(WebCore::GraphicsContextGLOpenGL::transformFeedbackVaryings):
(WebCore::GraphicsContextGLOpenGL::getTransformFeedbackVarying):
(WebCore::GraphicsContextGLOpenGL::bindBufferBase):
(WebCore::GraphicsContextGLOpenGL::blitFramebuffer):
(WebCore::GraphicsContextGLOpenGL::framebufferTextureLayer):
(WebCore::GraphicsContextGLOpenGL::invalidateFramebuffer):
(WebCore::GraphicsContextGLOpenGL::invalidateSubFramebuffer):
(WebCore::GraphicsContextGLOpenGL::readBuffer):
(WebCore::GraphicsContextGLOpenGL::copyTexSubImage3D):
(WebCore::GraphicsContextGLOpenGL::getFragDataLocation):
(WebCore::GraphicsContextGLOpenGL::uniform1ui):
(WebCore::GraphicsContextGLOpenGL::uniform2ui):
(WebCore::GraphicsContextGLOpenGL::uniform3ui):
(WebCore::GraphicsContextGLOpenGL::uniform4ui):
(WebCore::GraphicsContextGLOpenGL::uniform1uiv):
(WebCore::GraphicsContextGLOpenGL::uniform2uiv):
(WebCore::GraphicsContextGLOpenGL::uniform3uiv):
(WebCore::GraphicsContextGLOpenGL::uniform4uiv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix2x3fv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix3x2fv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix2x4fv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix4x2fv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix3x4fv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix4x3fv):
(WebCore::GraphicsContextGLOpenGL::vertexAttribI4i):
(WebCore::GraphicsContextGLOpenGL::vertexAttribI4iv):
(WebCore::GraphicsContextGLOpenGL::vertexAttribI4ui):
(WebCore::GraphicsContextGLOpenGL::vertexAttribI4uiv):
(WebCore::GraphicsContextGLOpenGL::drawRangeElements):
(WebCore::GraphicsContextGLOpenGL::drawBuffers):
(WebCore::GraphicsContextGLOpenGL::clearBufferiv):
(WebCore::GraphicsContextGLOpenGL::clearBufferuiv):
(WebCore::GraphicsContextGLOpenGL::clearBufferfv):
(WebCore::GraphicsContextGLOpenGL::clearBufferfi):
(WebCore::GraphicsContextGLOpenGL::deleteQuery):
(WebCore::GraphicsContextGLOpenGL::isQuery):
(WebCore::GraphicsContextGLOpenGL::getQuery):
(WebCore::GraphicsContextGLOpenGL::createSampler):
(WebCore::GraphicsContextGLOpenGL::deleteSampler):
(WebCore::GraphicsContextGLOpenGL::isSampler):
(WebCore::GraphicsContextGLOpenGL::bindSampler):
(WebCore::GraphicsContextGLOpenGL::samplerParameteri):
(WebCore::GraphicsContextGLOpenGL::samplerParameterf):
(WebCore::GraphicsContextGLOpenGL::getSamplerParameterfv):
(WebCore::GraphicsContextGLOpenGL::getSamplerParameteriv):
(WebCore::GraphicsContextGLOpenGL::fenceSync):
(WebCore::GraphicsContextGLOpenGL::isSync):
(WebCore::GraphicsContextGLOpenGL::deleteSync):
(WebCore::GraphicsContextGLOpenGL::clientWaitSync):
(WebCore::GraphicsContextGLOpenGL::waitSync):
(WebCore::GraphicsContextGLOpenGL::getSynciv):
(WebCore::GraphicsContextGLOpenGL::pauseTransformFeedback):
(WebCore::GraphicsContextGLOpenGL::resumeTransformFeedback):
(WebCore::GraphicsContextGLOpenGL::bindBufferRange):
(WebCore::GraphicsContextGLOpenGL::getUniformIndices):

• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:

(WebCore::GraphicsContextGLOpenGL::~GraphicsContextGLOpenGL):
(WebCore::GraphicsContextGLOpenGL::updateCGLContext):

• platform/graphics/opengl/ExtensionsGLOpenGL.cpp:

(WebCore::ExtensionsGLOpenGL::blitFramebuffer):
(WebCore::ExtensionsGLOpenGL::renderbufferStorageMultisample):
(WebCore::ExtensionsGLOpenGL::createVertexArrayOES):
(WebCore::ExtensionsGLOpenGL::deleteVertexArrayOES):
(WebCore::ExtensionsGLOpenGL::isVertexArrayOES):
(WebCore::ExtensionsGLOpenGL::bindVertexArrayOES):
(WebCore::ExtensionsGLOpenGL::supportsExtension):
(WebCore::ExtensionsGLOpenGL::drawBuffersEXT):
(WebCore::ExtensionsGLOpenGL::drawArraysInstanced):
(WebCore::ExtensionsGLOpenGL::drawElementsInstanced):
(WebCore::ExtensionsGLOpenGL::vertexAttribDivisor):

• platform/graphics/opengl/ExtensionsGLOpenGLES.cpp:

(WebCore::ExtensionsGLOpenGLES::framebufferTexture2DMultisampleIMG):
(WebCore::ExtensionsGLOpenGLES::renderbufferStorageMultisampleIMG):
(WebCore::ExtensionsGLOpenGLES::renderbufferStorageMultisample):
(WebCore::ExtensionsGLOpenGLES::createVertexArrayOES):
(WebCore::ExtensionsGLOpenGLES::deleteVertexArrayOES):
(WebCore::ExtensionsGLOpenGLES::isVertexArrayOES):
(WebCore::ExtensionsGLOpenGLES::bindVertexArrayOES):
(WebCore::ExtensionsGLOpenGLES::getGraphicsResetStatusARB):
(WebCore::ExtensionsGLOpenGLES::readnPixelsEXT):
(WebCore::ExtensionsGLOpenGLES::getnUniformfvEXT):
(WebCore::ExtensionsGLOpenGLES::getnUniformivEXT):
(WebCore::ExtensionsGLOpenGLES::drawArraysInstanced):
(WebCore::ExtensionsGLOpenGLES::drawElementsInstanced):
(WebCore::ExtensionsGLOpenGLES::vertexAttribDivisor):

• platform/graphics/opengl/GraphicsContextGLOpenGL.h:
• platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:

(WebCore::GraphicsContextGLOpenGL::renderbufferStorage):
(WebCore::GraphicsContextGLOpenGL::getIntegerv):
(WebCore::GraphicsContextGLOpenGL::getShaderPrecisionFormat):
(WebCore::GraphicsContextGLOpenGL::depthRange):
(WebCore::GraphicsContextGLOpenGL::clearDepth):
(WebCore::GraphicsContextGLOpenGL::readPixels):

• platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:

(WebCore::GraphicsContextGLOpenGL::prepareTexture):
(WebCore::GraphicsContextGLOpenGL::readRenderingResults):
(WebCore::GraphicsContextGLOpenGL::reshape):
(WebCore::GraphicsContextGLOpenGL::activeTexture):
(WebCore::GraphicsContextGLOpenGL::attachShader):
(WebCore::GraphicsContextGLOpenGL::bindAttribLocation):
(WebCore::GraphicsContextGLOpenGL::bindBuffer):
(WebCore::GraphicsContextGLOpenGL::bindFramebuffer):
(WebCore::GraphicsContextGLOpenGL::bindRenderbuffer):
(WebCore::GraphicsContextGLOpenGL::bindTexture):
(WebCore::GraphicsContextGLOpenGL::blendColor):
(WebCore::GraphicsContextGLOpenGL::blendEquation):
(WebCore::GraphicsContextGLOpenGL::blendEquationSeparate):
(WebCore::GraphicsContextGLOpenGL::blendFunc):
(WebCore::GraphicsContextGLOpenGL::blendFuncSeparate):
(WebCore::GraphicsContextGLOpenGL::bufferData):
(WebCore::GraphicsContextGLOpenGL::bufferSubData):
(WebCore::GraphicsContextGLOpenGL::checkFramebufferStatus):
(WebCore::GraphicsContextGLOpenGL::clearColor):
(WebCore::GraphicsContextGLOpenGL::clear):
(WebCore::GraphicsContextGLOpenGL::clearStencil):
(WebCore::GraphicsContextGLOpenGL::colorMask):
(WebCore::GraphicsContextGLOpenGL::compileShader):
(WebCore::GraphicsContextGLOpenGL::compileShaderDirect):
(WebCore::GraphicsContextGLOpenGL::copyTexImage2D):
(WebCore::GraphicsContextGLOpenGL::copyTexSubImage2D):
(WebCore::GraphicsContextGLOpenGL::cullFace):
(WebCore::GraphicsContextGLOpenGL::depthFunc):
(WebCore::GraphicsContextGLOpenGL::depthMask):
(WebCore::GraphicsContextGLOpenGL::detachShader):
(WebCore::GraphicsContextGLOpenGL::disable):
(WebCore::GraphicsContextGLOpenGL::disableVertexAttribArray):
(WebCore::GraphicsContextGLOpenGL::drawArrays):
(WebCore::GraphicsContextGLOpenGL::drawElements):
(WebCore::GraphicsContextGLOpenGL::enable):
(WebCore::GraphicsContextGLOpenGL::enableVertexAttribArray):
(WebCore::GraphicsContextGLOpenGL::finish):
(WebCore::GraphicsContextGLOpenGL::flush):
(WebCore::GraphicsContextGLOpenGL::framebufferRenderbuffer):
(WebCore::GraphicsContextGLOpenGL::framebufferTexture2D):
(WebCore::GraphicsContextGLOpenGL::frontFace):
(WebCore::GraphicsContextGLOpenGL::generateMipmap):
(WebCore::GraphicsContextGLOpenGL::getActiveAttribImpl):
(WebCore::GraphicsContextGLOpenGL::getActiveUniformImpl):
(WebCore::GraphicsContextGLOpenGL::getAttachedShaders):
(WebCore::GraphicsContextGLOpenGL::getAttribLocation):
(WebCore::GraphicsContextGLOpenGL::getAttribLocationDirect):
(WebCore::GraphicsContextGLOpenGL::moveErrorsToSyntheticErrorList):
(WebCore::GraphicsContextGLOpenGL::getError):
(WebCore::GraphicsContextGLOpenGL::getString):
(WebCore::GraphicsContextGLOpenGL::hint):
(WebCore::GraphicsContextGLOpenGL::isBuffer):
(WebCore::GraphicsContextGLOpenGL::isEnabled):
(WebCore::GraphicsContextGLOpenGL::isFramebuffer):
(WebCore::GraphicsContextGLOpenGL::isProgram):
(WebCore::GraphicsContextGLOpenGL::isRenderbuffer):
(WebCore::GraphicsContextGLOpenGL::isShader):
(WebCore::GraphicsContextGLOpenGL::isTexture):
(WebCore::GraphicsContextGLOpenGL::lineWidth):
(WebCore::GraphicsContextGLOpenGL::linkProgram):
(WebCore::GraphicsContextGLOpenGL::pixelStorei):
(WebCore::GraphicsContextGLOpenGL::polygonOffset):
(WebCore::GraphicsContextGLOpenGL::sampleCoverage):
(WebCore::GraphicsContextGLOpenGL::scissor):
(WebCore::GraphicsContextGLOpenGL::shaderSource):
(WebCore::GraphicsContextGLOpenGL::stencilFunc):
(WebCore::GraphicsContextGLOpenGL::stencilFuncSeparate):
(WebCore::GraphicsContextGLOpenGL::stencilMask):
(WebCore::GraphicsContextGLOpenGL::stencilMaskSeparate):
(WebCore::GraphicsContextGLOpenGL::stencilOp):
(WebCore::GraphicsContextGLOpenGL::stencilOpSeparate):
(WebCore::GraphicsContextGLOpenGL::texParameterf):
(WebCore::GraphicsContextGLOpenGL::texParameteri):
(WebCore::GraphicsContextGLOpenGL::uniform1f):
(WebCore::GraphicsContextGLOpenGL::uniform1fv):
(WebCore::GraphicsContextGLOpenGL::uniform2f):
(WebCore::GraphicsContextGLOpenGL::uniform2fv):
(WebCore::GraphicsContextGLOpenGL::uniform3f):
(WebCore::GraphicsContextGLOpenGL::uniform3fv):
(WebCore::GraphicsContextGLOpenGL::uniform4f):
(WebCore::GraphicsContextGLOpenGL::uniform4fv):
(WebCore::GraphicsContextGLOpenGL::uniform1i):
(WebCore::GraphicsContextGLOpenGL::uniform1iv):
(WebCore::GraphicsContextGLOpenGL::uniform2i):
(WebCore::GraphicsContextGLOpenGL::uniform2iv):
(WebCore::GraphicsContextGLOpenGL::uniform3i):
(WebCore::GraphicsContextGLOpenGL::uniform3iv):
(WebCore::GraphicsContextGLOpenGL::uniform4i):
(WebCore::GraphicsContextGLOpenGL::uniform4iv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix2fv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix3fv):
(WebCore::GraphicsContextGLOpenGL::uniformMatrix4fv):
(WebCore::GraphicsContextGLOpenGL::useProgram):
(WebCore::GraphicsContextGLOpenGL::validateProgram):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib1f):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib1fv):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib2f):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib2fv):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib3f):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib3fv):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib4f):
(WebCore::GraphicsContextGLOpenGL::vertexAttrib4fv):
(WebCore::GraphicsContextGLOpenGL::vertexAttribPointer):
(WebCore::GraphicsContextGLOpenGL::viewport):
(WebCore::GraphicsContextGLOpenGL::createVertexArray):
(WebCore::GraphicsContextGLOpenGL::deleteVertexArray):
(WebCore::GraphicsContextGLOpenGL::isVertexArray):
(WebCore::GraphicsContextGLOpenGL::bindVertexArray):
(WebCore::GraphicsContextGLOpenGL::getBooleanv):
(WebCore::GraphicsContextGLOpenGL::getBufferParameteriv):
(WebCore::GraphicsContextGLOpenGL::getFloatv):
(WebCore::GraphicsContextGLOpenGL::getIntegeri_v):
(WebCore::GraphicsContextGLOpenGL::getInteger64v):
(WebCore::GraphicsContextGLOpenGL::getInteger64i_v):
(WebCore::GraphicsContextGLOpenGL::getFramebufferAttachmentParameteriv):
(WebCore::GraphicsContextGLOpenGL::getProgramiv):
(WebCore::GraphicsContextGLOpenGL::getNonBuiltInActiveSymbolCount):
(WebCore::GraphicsContextGLOpenGL::getProgramInfoLog):
(WebCore::GraphicsContextGLOpenGL::getRenderbufferParameteriv):
(WebCore::GraphicsContextGLOpenGL::getShaderiv):
(WebCore::GraphicsContextGLOpenGL::getShaderInfoLog):
(WebCore::GraphicsContextGLOpenGL::getShaderSource):
(WebCore::GraphicsContextGLOpenGL::getTexParameterfv):
(WebCore::GraphicsContextGLOpenGL::getTexParameteriv):
(WebCore::GraphicsContextGLOpenGL::getUniformfv):
(WebCore::GraphicsContextGLOpenGL::getUniformiv):
(WebCore::GraphicsContextGLOpenGL::getUniformLocation):
(WebCore::GraphicsContextGLOpenGL::getVertexAttribfv):
(WebCore::GraphicsContextGLOpenGL::getVertexAttribiv):
(WebCore::GraphicsContextGLOpenGL::getVertexAttribOffset):
(WebCore::GraphicsContextGLOpenGL::texSubImage2D):
(WebCore::GraphicsContextGLOpenGL::compressedTexImage2D):
(WebCore::GraphicsContextGLOpenGL::compressedTexSubImage2D):
(WebCore::GraphicsContextGLOpenGL::createBuffer):
(WebCore::GraphicsContextGLOpenGL::createFramebuffer):
(WebCore::GraphicsContextGLOpenGL::createProgram):
(WebCore::GraphicsContextGLOpenGL::createRenderbuffer):
(WebCore::GraphicsContextGLOpenGL::createShader):
(WebCore::GraphicsContextGLOpenGL::createTexture):
(WebCore::GraphicsContextGLOpenGL::deleteBuffer):
(WebCore::GraphicsContextGLOpenGL::deleteFramebuffer):
(WebCore::GraphicsContextGLOpenGL::deleteProgram):
(WebCore::GraphicsContextGLOpenGL::deleteRenderbuffer):
(WebCore::GraphicsContextGLOpenGL::deleteShader):
(WebCore::GraphicsContextGLOpenGL::deleteTexture):
(WebCore::GraphicsContextGLOpenGL::texImage2DDirect):
(WebCore::GraphicsContextGLOpenGL::primitiveRestartIndex):
(WebCore::GraphicsContextGLOpenGL::copyBufferSubData):
(WebCore::GraphicsContextGLOpenGL::mapBufferRange):
(WebCore::GraphicsContextGLOpenGL::unmapBuffer):
(WebCore::GraphicsContextGLOpenGL::getInternalformativ):
(WebCore::GraphicsContextGLOpenGL::renderbufferStorageMultisample):
(WebCore::GraphicsContextGLOpenGL::texStorage2D):
(WebCore::GraphicsContextGLOpenGL::texStorage3D):
(WebCore::GraphicsContextGLOpenGL::getActiveUniforms):

• platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp:

(WebCore::GraphicsContextGLOpenGL::readPixels):
(WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
(WebCore::GraphicsContextGLOpenGL::renderbufferStorage):
(WebCore::GraphicsContextGLOpenGL::getIntegerv):
(WebCore::GraphicsContextGLOpenGL::getShaderPrecisionFormat):
(WebCore::GraphicsContextGLOpenGL::depthRange):
(WebCore::GraphicsContextGLOpenGL::clearDepth):
(WebCore::GraphicsContextGLOpenGL::create):
(WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
(WebCore::GraphicsContextGLOpenGL::~GraphicsContextGLOpenGL):

• platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:

(WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
(WebCore::GraphicsContextGLOpenGL::~GraphicsContextGLOpenGL):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLRenderingContextBase.cpp (modified) (2 diffs)
• platform/graphics/angle/ExtensionsGLANGLE.cpp (modified) (77 diffs)
• platform/graphics/angle/GraphicsContextGLANGLE.cpp (modified) (247 diffs)
• platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm (modified) (4 diffs)
• platform/graphics/opengl/ExtensionsGLOpenGL.cpp (modified) (10 diffs)
• platform/graphics/opengl/ExtensionsGLOpenGLES.cpp (modified) (14 diffs)
• platform/graphics/opengl/GraphicsContextGLOpenGL.h (modified) (2 diffs)
• platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp (modified) (6 diffs)
• platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp (modified) (158 diffs)
• platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp (modified) (8 diffs)
• platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-13  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        Remove uses of MakeCurrent from WebGL implementation
+        https://bugs.webkit.org/show_bug.cgi?id=218178
+        <rdar://problem/70714561>
+
+        Reviewed by Dean Jackson.
+
+        Work towards WebGL implementation which uses
+        GraphicsContextGL abstract base class instead of
+        GraphicsContextGLOpenGL concrete class.
+
+        Move GraphicsContextGLOpenGL::makeContextCurrent() to
+        private section, as it is an implementation detail of
+        the class. The function is intended to be called at the
+        start of all public functions that might call into OpenGL
+        to ensure that OpenGL uses the right context.
+
+        Check all return values of makeCurrentContext(). We
+        should not call into OpenGL if the context is not current,
+        as that can lead to corruption, crashes or incorrect results.
+        Add a compile-time warning if the return value is not used.
+        Non-EWS compiled flavors of GraphicsContextGLOpenGL are changed
+        only in best effort manner.
+
+        Ensure that all functions actually call the makeCurrentContext()
+        function before calling into OpenGL. Non-ANGLE flavors of
+        GraphicsContextGLOpenGL are ensured only in best effort manner.
+
+        ANGLE flavor of GraphicsContextGLOpenGL function implementations
+        should call directly the ANGLE functions instead of calling them
+        through getExtensions() interface. There is no conditional code
+        inside and the implementation knows exactly which function to
+        call in all situations. There is no abstraction between
+        GraphicsContextGLOpenGL and ExtensionsGL, rather they are
+        in practice the same object currently, semi-artificially split to
+        two. This is true of other flavors of GraphicsContextGLOpenGL,
+        but those are left unchanged in this regard.
+
+        No new tests, a refactor.
+
+        * html/canvas/WebGLRenderingContextBase.cpp:
+        (WebCore::WebGLRenderingContextBase::create):
+        (WebCore::WebGLRenderingContextBase::initializeNewContext):
+        (WebCore::WebGLRenderingContextBase::validateElementArraySize):
+        (WebCore::WebGLRenderingContextBase::validateIndexArrayPrecise):
+        (WebCore::WebGLRenderingContextBase::validateDrawElements):
+        (WebCore::WebGLRenderingContextBase::readPixels):
+        (WebCore::WebGLRenderingContextBase::vertexAttribfvImpl):
+        (WebCore::WebGLRenderingContextBase::initVertexAttrib0):
+        * platform/graphics/angle/ExtensionsGLANGLE.cpp:
+        (WebCore::ExtensionsGLANGLE::supports):
+        (WebCore::ExtensionsGLANGLE::ensureEnabled):
+        (WebCore::ExtensionsGLANGLE::getTranslatedShaderSourceANGLE):
+        (WebCore::ExtensionsGLANGLE::blitFramebuffer):
+        (WebCore::ExtensionsGLANGLE::renderbufferStorageMultisample):
+        (WebCore::ExtensionsGLANGLE::createVertexArrayOES):
+        (WebCore::ExtensionsGLANGLE::deleteVertexArrayOES):
+        (WebCore::ExtensionsGLANGLE::isVertexArrayOES):
+        (WebCore::ExtensionsGLANGLE::bindVertexArrayOES):
+        (WebCore::ExtensionsGLANGLE::drawBuffersEXT):
+        (WebCore::ExtensionsGLANGLE::drawArraysInstanced):
+        (WebCore::ExtensionsGLANGLE::drawElementsInstanced):
+        (WebCore::ExtensionsGLANGLE::vertexAttribDivisor):
+        (WebCore::ExtensionsGLANGLE::getBooleanvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getBufferParameterivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getFloatvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getFramebufferAttachmentParameterivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getIntegervRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getProgramivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getRenderbufferParameterivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getShaderivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getTexParameterfvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getTexParameterivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getUniformfvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getUniformivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getVertexAttribfvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getVertexAttribivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getVertexAttribPointervRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::readPixelsRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::texImage2DRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::texParameterfvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::texParameterivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::texSubImage2DRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::compressedTexImage2DRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::compressedTexSubImage2DRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::compressedTexImage3DRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::compressedTexSubImage3DRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::texImage3DRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::texSubImage3DRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getQueryivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getQueryObjectuivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getBufferPointervRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getIntegeri_vRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getInternalformativRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getVertexAttribIivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getVertexAttribIuivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getUniformuivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getActiveUniformBlockivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getInteger64vRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getInteger64i_vRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getBufferParameteri64vRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::samplerParameterivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::samplerParameterfvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getSamplerParameterivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getSamplerParameterfvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getFramebufferParameterivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getProgramInterfaceivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getBooleani_vRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getMultisamplefvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getTexLevelParameterivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getTexLevelParameterfvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getPointervRobustANGLERobustANGLE):
+        (WebCore::ExtensionsGLANGLE::readnPixelsRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getnUniformfvRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getnUniformivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getnUniformuivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::texParameterIivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::texParameterIuivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getTexParameterIivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getTexParameterIuivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::samplerParameterIivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::samplerParameterIuivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getSamplerParameterIivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getSamplerParameterIuivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getQueryObjectivRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getQueryObjecti64vRobustANGLE):
+        (WebCore::ExtensionsGLANGLE::getQueryObjectui64vRobustANGLE):
+        * platform/graphics/angle/GraphicsContextGLANGLE.cpp:
+        (WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
+        (WebCore::GraphicsContextGLOpenGL::renderbufferStorage):
+        (WebCore::GraphicsContextGLOpenGL::getIntegerv):
+        (WebCore::GraphicsContextGLOpenGL::getIntegeri_v):
+        (WebCore::GraphicsContextGLOpenGL::getShaderPrecisionFormat):
+        (WebCore::GraphicsContextGLOpenGL::depthRange):
+        (WebCore::GraphicsContextGLOpenGL::clearDepth):
+        (WebCore::GraphicsContextGLOpenGL::readPixels):
+        (WebCore::GraphicsContextGLOpenGL::prepareTexture):
+        (WebCore::GraphicsContextGLOpenGL::readRenderingResults):
+        (WebCore::GraphicsContextGLOpenGL::reshape):
+        (WebCore::GraphicsContextGLOpenGL::activeTexture):
+        (WebCore::GraphicsContextGLOpenGL::attachShader):
+        (WebCore::GraphicsContextGLOpenGL::bindAttribLocation):
+        (WebCore::GraphicsContextGLOpenGL::bindBuffer):
+        (WebCore::GraphicsContextGLOpenGL::bindFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::bindRenderbuffer):
+        (WebCore::GraphicsContextGLOpenGL::bindTexture):
+        (WebCore::GraphicsContextGLOpenGL::blendColor):
+        (WebCore::GraphicsContextGLOpenGL::blendEquation):
+        (WebCore::GraphicsContextGLOpenGL::blendEquationSeparate):
+        (WebCore::GraphicsContextGLOpenGL::blendFunc):
+        (WebCore::GraphicsContextGLOpenGL::blendFuncSeparate):
+        (WebCore::GraphicsContextGLOpenGL::bufferData):
+        (WebCore::GraphicsContextGLOpenGL::bufferSubData):
+        (WebCore::GraphicsContextGLOpenGL::mapBufferRange):
+        (WebCore::GraphicsContextGLOpenGL::unmapBuffer):
+        (WebCore::GraphicsContextGLOpenGL::copyBufferSubData):
+        (WebCore::GraphicsContextGLOpenGL::getInternalformativ):
+        (WebCore::GraphicsContextGLOpenGL::renderbufferStorageMultisample):
+        (WebCore::GraphicsContextGLOpenGL::texStorage2D):
+        (WebCore::GraphicsContextGLOpenGL::texStorage3D):
+        (WebCore::GraphicsContextGLOpenGL::getActiveUniforms):
+        (WebCore::GraphicsContextGLOpenGL::checkFramebufferStatus):
+        (WebCore::GraphicsContextGLOpenGL::clearColor):
+        (WebCore::GraphicsContextGLOpenGL::clear):
+        (WebCore::GraphicsContextGLOpenGL::clearStencil):
+        (WebCore::GraphicsContextGLOpenGL::colorMask):
+        (WebCore::GraphicsContextGLOpenGL::compileShader):
+        (WebCore::GraphicsContextGLOpenGL::compileShaderDirect):
+        (WebCore::GraphicsContextGLOpenGL::copyTexImage2D):
+        (WebCore::GraphicsContextGLOpenGL::copyTexSubImage2D):
+        (WebCore::GraphicsContextGLOpenGL::cullFace):
+        (WebCore::GraphicsContextGLOpenGL::depthFunc):
+        (WebCore::GraphicsContextGLOpenGL::depthMask):
+        (WebCore::GraphicsContextGLOpenGL::detachShader):
+        (WebCore::GraphicsContextGLOpenGL::disable):
+        (WebCore::GraphicsContextGLOpenGL::disableVertexAttribArray):
+        (WebCore::GraphicsContextGLOpenGL::drawArrays):
+        (WebCore::GraphicsContextGLOpenGL::drawElements):
+        (WebCore::GraphicsContextGLOpenGL::enable):
+        (WebCore::GraphicsContextGLOpenGL::enableVertexAttribArray):
+        (WebCore::GraphicsContextGLOpenGL::finish):
+        (WebCore::GraphicsContextGLOpenGL::flush):
+        (WebCore::GraphicsContextGLOpenGL::framebufferRenderbuffer):
+        (WebCore::GraphicsContextGLOpenGL::framebufferTexture2D):
+        (WebCore::GraphicsContextGLOpenGL::frontFace):
+        (WebCore::GraphicsContextGLOpenGL::generateMipmap):
+        (WebCore::GraphicsContextGLOpenGL::getActiveAttribImpl):
+        (WebCore::GraphicsContextGLOpenGL::getActiveUniformImpl):
+        (WebCore::GraphicsContextGLOpenGL::getAttachedShaders):
+        (WebCore::GraphicsContextGLOpenGL::getAttribLocation):
+        (WebCore::GraphicsContextGLOpenGL::moveErrorsToSyntheticErrorList):
+        (WebCore::GraphicsContextGLOpenGL::getError):
+        (WebCore::GraphicsContextGLOpenGL::getString):
+        (WebCore::GraphicsContextGLOpenGL::hint):
+        (WebCore::GraphicsContextGLOpenGL::isBuffer):
+        (WebCore::GraphicsContextGLOpenGL::isEnabled):
+        (WebCore::GraphicsContextGLOpenGL::isFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::isProgram):
+        (WebCore::GraphicsContextGLOpenGL::isRenderbuffer):
+        (WebCore::GraphicsContextGLOpenGL::isShader):
+        (WebCore::GraphicsContextGLOpenGL::isTexture):
+        (WebCore::GraphicsContextGLOpenGL::lineWidth):
+        (WebCore::GraphicsContextGLOpenGL::linkProgram):
+        (WebCore::GraphicsContextGLOpenGL::pixelStorei):
+        (WebCore::GraphicsContextGLOpenGL::polygonOffset):
+        (WebCore::GraphicsContextGLOpenGL::sampleCoverage):
+        (WebCore::GraphicsContextGLOpenGL::scissor):
+        (WebCore::GraphicsContextGLOpenGL::shaderSource):
+        (WebCore::GraphicsContextGLOpenGL::stencilFunc):
+        (WebCore::GraphicsContextGLOpenGL::stencilFuncSeparate):
+        (WebCore::GraphicsContextGLOpenGL::stencilMask):
+        (WebCore::GraphicsContextGLOpenGL::stencilMaskSeparate):
+        (WebCore::GraphicsContextGLOpenGL::stencilOp):
+        (WebCore::GraphicsContextGLOpenGL::stencilOpSeparate):
+        (WebCore::GraphicsContextGLOpenGL::texParameterf):
+        (WebCore::GraphicsContextGLOpenGL::texParameteri):
+        (WebCore::GraphicsContextGLOpenGL::uniform1f):
+        (WebCore::GraphicsContextGLOpenGL::uniform1fv):
+        (WebCore::GraphicsContextGLOpenGL::uniform2f):
+        (WebCore::GraphicsContextGLOpenGL::uniform2fv):
+        (WebCore::GraphicsContextGLOpenGL::uniform3f):
+        (WebCore::GraphicsContextGLOpenGL::uniform3fv):
+        (WebCore::GraphicsContextGLOpenGL::uniform4f):
+        (WebCore::GraphicsContextGLOpenGL::uniform4fv):
+        (WebCore::GraphicsContextGLOpenGL::uniform1i):
+        (WebCore::GraphicsContextGLOpenGL::uniform1iv):
+        (WebCore::GraphicsContextGLOpenGL::uniform2i):
+        (WebCore::GraphicsContextGLOpenGL::uniform2iv):
+        (WebCore::GraphicsContextGLOpenGL::uniform3i):
+        (WebCore::GraphicsContextGLOpenGL::uniform3iv):
+        (WebCore::GraphicsContextGLOpenGL::uniform4i):
+        (WebCore::GraphicsContextGLOpenGL::uniform4iv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix2fv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix3fv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix4fv):
+        (WebCore::GraphicsContextGLOpenGL::useProgram):
+        (WebCore::GraphicsContextGLOpenGL::validateProgram):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib1f):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib1fv):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib2f):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib2fv):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib3f):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib3fv):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib4f):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib4fv):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttribPointer):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttribIPointer):
+        (WebCore::GraphicsContextGLOpenGL::viewport):
+        (WebCore::GraphicsContextGLOpenGL::createVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::deleteVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::isVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::bindVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::getBooleanv):
+        (WebCore::GraphicsContextGLOpenGL::getBufferParameteriv):
+        (WebCore::GraphicsContextGLOpenGL::getFloatv):
+        (WebCore::GraphicsContextGLOpenGL::getInteger64v):
+        (WebCore::GraphicsContextGLOpenGL::getInteger64i_v):
+        (WebCore::GraphicsContextGLOpenGL::getFramebufferAttachmentParameteriv):
+        (WebCore::GraphicsContextGLOpenGL::getProgramiv):
+        (WebCore::GraphicsContextGLOpenGL::getProgramInfoLog):
+        (WebCore::GraphicsContextGLOpenGL::getRenderbufferParameteriv):
+        (WebCore::GraphicsContextGLOpenGL::getShaderiv):
+        (WebCore::GraphicsContextGLOpenGL::getShaderInfoLog):
+        (WebCore::GraphicsContextGLOpenGL::getTexParameterfv):
+        (WebCore::GraphicsContextGLOpenGL::getTexParameteriv):
+        (WebCore::GraphicsContextGLOpenGL::getUniformfv):
+        (WebCore::GraphicsContextGLOpenGL::getUniformiv):
+        (WebCore::GraphicsContextGLOpenGL::getUniformuiv):
+        (WebCore::GraphicsContextGLOpenGL::getUniformLocation):
+        (WebCore::GraphicsContextGLOpenGL::getVertexAttribfv):
+        (WebCore::GraphicsContextGLOpenGL::getVertexAttribiv):
+        (WebCore::GraphicsContextGLOpenGL::getVertexAttribOffset):
+        (WebCore::GraphicsContextGLOpenGL::texSubImage2D):
+        (WebCore::GraphicsContextGLOpenGL::compressedTexImage2D):
+        (WebCore::GraphicsContextGLOpenGL::compressedTexSubImage2D):
+        (WebCore::GraphicsContextGLOpenGL::createBuffer):
+        (WebCore::GraphicsContextGLOpenGL::createFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::createProgram):
+        (WebCore::GraphicsContextGLOpenGL::createRenderbuffer):
+        (WebCore::GraphicsContextGLOpenGL::createShader):
+        (WebCore::GraphicsContextGLOpenGL::createTexture):
+        (WebCore::GraphicsContextGLOpenGL::deleteBuffer):
+        (WebCore::GraphicsContextGLOpenGL::deleteFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::deleteProgram):
+        (WebCore::GraphicsContextGLOpenGL::deleteRenderbuffer):
+        (WebCore::GraphicsContextGLOpenGL::deleteShader):
+        (WebCore::GraphicsContextGLOpenGL::deleteTexture):
+        (WebCore::GraphicsContextGLOpenGL::texImage2DDirect):
+        (WebCore::GraphicsContextGLOpenGL::drawArraysInstanced):
+        (WebCore::GraphicsContextGLOpenGL::drawElementsInstanced):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttribDivisor):
+        (WebCore::GraphicsContextGLOpenGL::getUniformBlockIndex):
+        (WebCore::GraphicsContextGLOpenGL::getActiveUniformBlockName):
+        (WebCore::GraphicsContextGLOpenGL::uniformBlockBinding):
+        (WebCore::GraphicsContextGLOpenGL::createQuery):
+        (WebCore::GraphicsContextGLOpenGL::beginQuery):
+        (WebCore::GraphicsContextGLOpenGL::endQuery):
+        (WebCore::GraphicsContextGLOpenGL::getQueryObjectuiv):
+        (WebCore::GraphicsContextGLOpenGL::createTransformFeedback):
+        (WebCore::GraphicsContextGLOpenGL::deleteTransformFeedback):
+        (WebCore::GraphicsContextGLOpenGL::isTransformFeedback):
+        (WebCore::GraphicsContextGLOpenGL::bindTransformFeedback):
+        (WebCore::GraphicsContextGLOpenGL::beginTransformFeedback):
+        (WebCore::GraphicsContextGLOpenGL::endTransformFeedback):
+        (WebCore::GraphicsContextGLOpenGL::transformFeedbackVaryings):
+        (WebCore::GraphicsContextGLOpenGL::getTransformFeedbackVarying):
+        (WebCore::GraphicsContextGLOpenGL::bindBufferBase):
+        (WebCore::GraphicsContextGLOpenGL::blitFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::framebufferTextureLayer):
+        (WebCore::GraphicsContextGLOpenGL::invalidateFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::invalidateSubFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::readBuffer):
+        (WebCore::GraphicsContextGLOpenGL::copyTexSubImage3D):
+        (WebCore::GraphicsContextGLOpenGL::getFragDataLocation):
+        (WebCore::GraphicsContextGLOpenGL::uniform1ui):
+        (WebCore::GraphicsContextGLOpenGL::uniform2ui):
+        (WebCore::GraphicsContextGLOpenGL::uniform3ui):
+        (WebCore::GraphicsContextGLOpenGL::uniform4ui):
+        (WebCore::GraphicsContextGLOpenGL::uniform1uiv):
+        (WebCore::GraphicsContextGLOpenGL::uniform2uiv):
+        (WebCore::GraphicsContextGLOpenGL::uniform3uiv):
+        (WebCore::GraphicsContextGLOpenGL::uniform4uiv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix2x3fv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix3x2fv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix2x4fv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix4x2fv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix3x4fv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix4x3fv):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttribI4i):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttribI4iv):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttribI4ui):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttribI4uiv):
+        (WebCore::GraphicsContextGLOpenGL::drawRangeElements):
+        (WebCore::GraphicsContextGLOpenGL::drawBuffers):
+        (WebCore::GraphicsContextGLOpenGL::clearBufferiv):
+        (WebCore::GraphicsContextGLOpenGL::clearBufferuiv):
+        (WebCore::GraphicsContextGLOpenGL::clearBufferfv):
+        (WebCore::GraphicsContextGLOpenGL::clearBufferfi):
+        (WebCore::GraphicsContextGLOpenGL::deleteQuery):
+        (WebCore::GraphicsContextGLOpenGL::isQuery):
+        (WebCore::GraphicsContextGLOpenGL::getQuery):
+        (WebCore::GraphicsContextGLOpenGL::createSampler):
+        (WebCore::GraphicsContextGLOpenGL::deleteSampler):
+        (WebCore::GraphicsContextGLOpenGL::isSampler):
+        (WebCore::GraphicsContextGLOpenGL::bindSampler):
+        (WebCore::GraphicsContextGLOpenGL::samplerParameteri):
+        (WebCore::GraphicsContextGLOpenGL::samplerParameterf):
+        (WebCore::GraphicsContextGLOpenGL::getSamplerParameterfv):
+        (WebCore::GraphicsContextGLOpenGL::getSamplerParameteriv):
+        (WebCore::GraphicsContextGLOpenGL::fenceSync):
+        (WebCore::GraphicsContextGLOpenGL::isSync):
+        (WebCore::GraphicsContextGLOpenGL::deleteSync):
+        (WebCore::GraphicsContextGLOpenGL::clientWaitSync):
+        (WebCore::GraphicsContextGLOpenGL::waitSync):
+        (WebCore::GraphicsContextGLOpenGL::getSynciv):
+        (WebCore::GraphicsContextGLOpenGL::pauseTransformFeedback):
+        (WebCore::GraphicsContextGLOpenGL::resumeTransformFeedback):
+        (WebCore::GraphicsContextGLOpenGL::bindBufferRange):
+        (WebCore::GraphicsContextGLOpenGL::getUniformIndices):
+        * platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm:
+        (WebCore::GraphicsContextGLOpenGL::~GraphicsContextGLOpenGL):
+        (WebCore::GraphicsContextGLOpenGL::updateCGLContext):
+        * platform/graphics/opengl/ExtensionsGLOpenGL.cpp:
+        (WebCore::ExtensionsGLOpenGL::blitFramebuffer):
+        (WebCore::ExtensionsGLOpenGL::renderbufferStorageMultisample):
+        (WebCore::ExtensionsGLOpenGL::createVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGL::deleteVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGL::isVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGL::bindVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGL::supportsExtension):
+        (WebCore::ExtensionsGLOpenGL::drawBuffersEXT):
+        (WebCore::ExtensionsGLOpenGL::drawArraysInstanced):
+        (WebCore::ExtensionsGLOpenGL::drawElementsInstanced):
+        (WebCore::ExtensionsGLOpenGL::vertexAttribDivisor):
+        * platform/graphics/opengl/ExtensionsGLOpenGLES.cpp:
+        (WebCore::ExtensionsGLOpenGLES::framebufferTexture2DMultisampleIMG):
+        (WebCore::ExtensionsGLOpenGLES::renderbufferStorageMultisampleIMG):
+        (WebCore::ExtensionsGLOpenGLES::renderbufferStorageMultisample):
+        (WebCore::ExtensionsGLOpenGLES::createVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGLES::deleteVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGLES::isVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGLES::bindVertexArrayOES):
+        (WebCore::ExtensionsGLOpenGLES::getGraphicsResetStatusARB):
+        (WebCore::ExtensionsGLOpenGLES::readnPixelsEXT):
+        (WebCore::ExtensionsGLOpenGLES::getnUniformfvEXT):
+        (WebCore::ExtensionsGLOpenGLES::getnUniformivEXT):
+        (WebCore::ExtensionsGLOpenGLES::drawArraysInstanced):
+        (WebCore::ExtensionsGLOpenGLES::drawElementsInstanced):
+        (WebCore::ExtensionsGLOpenGLES::vertexAttribDivisor):
+        * platform/graphics/opengl/GraphicsContextGLOpenGL.h:
+        * platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp:
+        (WebCore::GraphicsContextGLOpenGL::renderbufferStorage):
+        (WebCore::GraphicsContextGLOpenGL::getIntegerv):
+        (WebCore::GraphicsContextGLOpenGL::getShaderPrecisionFormat):
+        (WebCore::GraphicsContextGLOpenGL::depthRange):
+        (WebCore::GraphicsContextGLOpenGL::clearDepth):
+        (WebCore::GraphicsContextGLOpenGL::readPixels):
+        * platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp:
+        (WebCore::GraphicsContextGLOpenGL::prepareTexture):
+        (WebCore::GraphicsContextGLOpenGL::readRenderingResults):
+        (WebCore::GraphicsContextGLOpenGL::reshape):
+        (WebCore::GraphicsContextGLOpenGL::activeTexture):
+        (WebCore::GraphicsContextGLOpenGL::attachShader):
+        (WebCore::GraphicsContextGLOpenGL::bindAttribLocation):
+        (WebCore::GraphicsContextGLOpenGL::bindBuffer):
+        (WebCore::GraphicsContextGLOpenGL::bindFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::bindRenderbuffer):
+        (WebCore::GraphicsContextGLOpenGL::bindTexture):
+        (WebCore::GraphicsContextGLOpenGL::blendColor):
+        (WebCore::GraphicsContextGLOpenGL::blendEquation):
+        (WebCore::GraphicsContextGLOpenGL::blendEquationSeparate):
+        (WebCore::GraphicsContextGLOpenGL::blendFunc):
+        (WebCore::GraphicsContextGLOpenGL::blendFuncSeparate):
+        (WebCore::GraphicsContextGLOpenGL::bufferData):
+        (WebCore::GraphicsContextGLOpenGL::bufferSubData):
+        (WebCore::GraphicsContextGLOpenGL::checkFramebufferStatus):
+        (WebCore::GraphicsContextGLOpenGL::clearColor):
+        (WebCore::GraphicsContextGLOpenGL::clear):
+        (WebCore::GraphicsContextGLOpenGL::clearStencil):
+        (WebCore::GraphicsContextGLOpenGL::colorMask):
+        (WebCore::GraphicsContextGLOpenGL::compileShader):
+        (WebCore::GraphicsContextGLOpenGL::compileShaderDirect):
+        (WebCore::GraphicsContextGLOpenGL::copyTexImage2D):
+        (WebCore::GraphicsContextGLOpenGL::copyTexSubImage2D):
+        (WebCore::GraphicsContextGLOpenGL::cullFace):
+        (WebCore::GraphicsContextGLOpenGL::depthFunc):
+        (WebCore::GraphicsContextGLOpenGL::depthMask):
+        (WebCore::GraphicsContextGLOpenGL::detachShader):
+        (WebCore::GraphicsContextGLOpenGL::disable):
+        (WebCore::GraphicsContextGLOpenGL::disableVertexAttribArray):
+        (WebCore::GraphicsContextGLOpenGL::drawArrays):
+        (WebCore::GraphicsContextGLOpenGL::drawElements):
+        (WebCore::GraphicsContextGLOpenGL::enable):
+        (WebCore::GraphicsContextGLOpenGL::enableVertexAttribArray):
+        (WebCore::GraphicsContextGLOpenGL::finish):
+        (WebCore::GraphicsContextGLOpenGL::flush):
+        (WebCore::GraphicsContextGLOpenGL::framebufferRenderbuffer):
+        (WebCore::GraphicsContextGLOpenGL::framebufferTexture2D):
+        (WebCore::GraphicsContextGLOpenGL::frontFace):
+        (WebCore::GraphicsContextGLOpenGL::generateMipmap):
+        (WebCore::GraphicsContextGLOpenGL::getActiveAttribImpl):
+        (WebCore::GraphicsContextGLOpenGL::getActiveUniformImpl):
+        (WebCore::GraphicsContextGLOpenGL::getAttachedShaders):
+        (WebCore::GraphicsContextGLOpenGL::getAttribLocation):
+        (WebCore::GraphicsContextGLOpenGL::getAttribLocationDirect):
+        (WebCore::GraphicsContextGLOpenGL::moveErrorsToSyntheticErrorList):
+        (WebCore::GraphicsContextGLOpenGL::getError):
+        (WebCore::GraphicsContextGLOpenGL::getString):
+        (WebCore::GraphicsContextGLOpenGL::hint):
+        (WebCore::GraphicsContextGLOpenGL::isBuffer):
+        (WebCore::GraphicsContextGLOpenGL::isEnabled):
+        (WebCore::GraphicsContextGLOpenGL::isFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::isProgram):
+        (WebCore::GraphicsContextGLOpenGL::isRenderbuffer):
+        (WebCore::GraphicsContextGLOpenGL::isShader):
+        (WebCore::GraphicsContextGLOpenGL::isTexture):
+        (WebCore::GraphicsContextGLOpenGL::lineWidth):
+        (WebCore::GraphicsContextGLOpenGL::linkProgram):
+        (WebCore::GraphicsContextGLOpenGL::pixelStorei):
+        (WebCore::GraphicsContextGLOpenGL::polygonOffset):
+        (WebCore::GraphicsContextGLOpenGL::sampleCoverage):
+        (WebCore::GraphicsContextGLOpenGL::scissor):
+        (WebCore::GraphicsContextGLOpenGL::shaderSource):
+        (WebCore::GraphicsContextGLOpenGL::stencilFunc):
+        (WebCore::GraphicsContextGLOpenGL::stencilFuncSeparate):
+        (WebCore::GraphicsContextGLOpenGL::stencilMask):
+        (WebCore::GraphicsContextGLOpenGL::stencilMaskSeparate):
+        (WebCore::GraphicsContextGLOpenGL::stencilOp):
+        (WebCore::GraphicsContextGLOpenGL::stencilOpSeparate):
+        (WebCore::GraphicsContextGLOpenGL::texParameterf):
+        (WebCore::GraphicsContextGLOpenGL::texParameteri):
+        (WebCore::GraphicsContextGLOpenGL::uniform1f):
+        (WebCore::GraphicsContextGLOpenGL::uniform1fv):
+        (WebCore::GraphicsContextGLOpenGL::uniform2f):
+        (WebCore::GraphicsContextGLOpenGL::uniform2fv):
+        (WebCore::GraphicsContextGLOpenGL::uniform3f):
+        (WebCore::GraphicsContextGLOpenGL::uniform3fv):
+        (WebCore::GraphicsContextGLOpenGL::uniform4f):
+        (WebCore::GraphicsContextGLOpenGL::uniform4fv):
+        (WebCore::GraphicsContextGLOpenGL::uniform1i):
+        (WebCore::GraphicsContextGLOpenGL::uniform1iv):
+        (WebCore::GraphicsContextGLOpenGL::uniform2i):
+        (WebCore::GraphicsContextGLOpenGL::uniform2iv):
+        (WebCore::GraphicsContextGLOpenGL::uniform3i):
+        (WebCore::GraphicsContextGLOpenGL::uniform3iv):
+        (WebCore::GraphicsContextGLOpenGL::uniform4i):
+        (WebCore::GraphicsContextGLOpenGL::uniform4iv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix2fv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix3fv):
+        (WebCore::GraphicsContextGLOpenGL::uniformMatrix4fv):
+        (WebCore::GraphicsContextGLOpenGL::useProgram):
+        (WebCore::GraphicsContextGLOpenGL::validateProgram):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib1f):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib1fv):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib2f):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib2fv):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib3f):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib3fv):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib4f):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttrib4fv):
+        (WebCore::GraphicsContextGLOpenGL::vertexAttribPointer):
+        (WebCore::GraphicsContextGLOpenGL::viewport):
+        (WebCore::GraphicsContextGLOpenGL::createVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::deleteVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::isVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::bindVertexArray):
+        (WebCore::GraphicsContextGLOpenGL::getBooleanv):
+        (WebCore::GraphicsContextGLOpenGL::getBufferParameteriv):
+        (WebCore::GraphicsContextGLOpenGL::getFloatv):
+        (WebCore::GraphicsContextGLOpenGL::getIntegeri_v):
+        (WebCore::GraphicsContextGLOpenGL::getInteger64v):
+        (WebCore::GraphicsContextGLOpenGL::getInteger64i_v):
+        (WebCore::GraphicsContextGLOpenGL::getFramebufferAttachmentParameteriv):
+        (WebCore::GraphicsContextGLOpenGL::getProgramiv):
+        (WebCore::GraphicsContextGLOpenGL::getNonBuiltInActiveSymbolCount):
+        (WebCore::GraphicsContextGLOpenGL::getProgramInfoLog):
+        (WebCore::GraphicsContextGLOpenGL::getRenderbufferParameteriv):
+        (WebCore::GraphicsContextGLOpenGL::getShaderiv):
+        (WebCore::GraphicsContextGLOpenGL::getShaderInfoLog):
+        (WebCore::GraphicsContextGLOpenGL::getShaderSource):
+        (WebCore::GraphicsContextGLOpenGL::getTexParameterfv):
+        (WebCore::GraphicsContextGLOpenGL::getTexParameteriv):
+        (WebCore::GraphicsContextGLOpenGL::getUniformfv):
+        (WebCore::GraphicsContextGLOpenGL::getUniformiv):
+        (WebCore::GraphicsContextGLOpenGL::getUniformLocation):
+        (WebCore::GraphicsContextGLOpenGL::getVertexAttribfv):
+        (WebCore::GraphicsContextGLOpenGL::getVertexAttribiv):
+        (WebCore::GraphicsContextGLOpenGL::getVertexAttribOffset):
+        (WebCore::GraphicsContextGLOpenGL::texSubImage2D):
+        (WebCore::GraphicsContextGLOpenGL::compressedTexImage2D):
+        (WebCore::GraphicsContextGLOpenGL::compressedTexSubImage2D):
+        (WebCore::GraphicsContextGLOpenGL::createBuffer):
+        (WebCore::GraphicsContextGLOpenGL::createFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::createProgram):
+        (WebCore::GraphicsContextGLOpenGL::createRenderbuffer):
+        (WebCore::GraphicsContextGLOpenGL::createShader):
+        (WebCore::GraphicsContextGLOpenGL::createTexture):
+        (WebCore::GraphicsContextGLOpenGL::deleteBuffer):
+        (WebCore::GraphicsContextGLOpenGL::deleteFramebuffer):
+        (WebCore::GraphicsContextGLOpenGL::deleteProgram):
+        (WebCore::GraphicsContextGLOpenGL::deleteRenderbuffer):
+        (WebCore::GraphicsContextGLOpenGL::deleteShader):
+        (WebCore::GraphicsContextGLOpenGL::deleteTexture):
+        (WebCore::GraphicsContextGLOpenGL::texImage2DDirect):
+        (WebCore::GraphicsContextGLOpenGL::primitiveRestartIndex):
+        (WebCore::GraphicsContextGLOpenGL::copyBufferSubData):
+        (WebCore::GraphicsContextGLOpenGL::mapBufferRange):
+        (WebCore::GraphicsContextGLOpenGL::unmapBuffer):
+        (WebCore::GraphicsContextGLOpenGL::getInternalformativ):
+        (WebCore::GraphicsContextGLOpenGL::renderbufferStorageMultisample):
+        (WebCore::GraphicsContextGLOpenGL::texStorage2D):
+        (WebCore::GraphicsContextGLOpenGL::texStorage3D):
+        (WebCore::GraphicsContextGLOpenGL::getActiveUniforms):
+        * platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp:
+        (WebCore::GraphicsContextGLOpenGL::readPixels):
+        (WebCore::GraphicsContextGLOpenGL::reshapeFBOs):
+        (WebCore::GraphicsContextGLOpenGL::renderbufferStorage):
+        (WebCore::GraphicsContextGLOpenGL::getIntegerv):
+        (WebCore::GraphicsContextGLOpenGL::getShaderPrecisionFormat):
+        (WebCore::GraphicsContextGLOpenGL::depthRange):
+        (WebCore::GraphicsContextGLOpenGL::clearDepth):
+        (WebCore::GraphicsContextGLOpenGL::create):
+        (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
+        (WebCore::GraphicsContextGLOpenGL::~GraphicsContextGLOpenGL):
+        * platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp:
+        (WebCore::GraphicsContextGLOpenGL::GraphicsContextGLOpenGL):
+        (WebCore::GraphicsContextGLOpenGL::~GraphicsContextGLOpenGL):
+
 2020-11-13  Miguel Gomez  <magomez@igalia.com>
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp

@@ -712 +712 @@
 
     auto context = GraphicsContextGLOpenGL::create(attributes, hostWindow);
-    if (!context || !context->makeContextCurrent()) {
+    if (!context) {
         if (canvasElement) {
             canvasElement->dispatchEvent(WebGLContextEvent::create(eventNames().webglcontextcreationerrorEvent,
@@ -4350 +4350 @@
 
 #if USE(ANGLE)
-        GCGLsizei length, columns, rows;
-        m_context->makeContextCurrent();
-        m_context->getExtensions().readnPixelsRobustANGLE(x, y, width, height, format, type, pixels.byteLength(), &length, &columns, &rows, data, false);
+    GCGLsizei length = 0;
+    GCGLsizei columns = 0;
+    GCGLsizei rows = 0;
+    m_context->getExtensions().readnPixelsRobustANGLE(x, y, width, height, format, type, pixels.byteLength(), &length, &columns, &rows, data, false);
 #else
     if (m_isRobustnessEXTSupported)

trunk/Source/WebCore/platform/graphics/angle/ExtensionsGLANGLE.cpp

@@ -75 +75 @@
 bool ExtensionsGLANGLE::supports(const String& name)
 {
-    if (!m_initializedAvailableExtensions)
+    if (!m_initializedAvailableExtensions) {
+        if (!m_context->makeContextCurrent())
+            return false;
         initializeAvailableExtensions();
-
+    }
     return supportsExtension(name);
 }
@@ -85 +87 @@
     // Enable support in ANGLE (if not enabled already).
     if (m_requestableExtensions.contains(name) && !m_enabledExtensions.contains(name)) {
-        m_context->makeContextCurrent();
+        if (!m_context->makeContextCurrent())
+            return;
         gl::RequestExtensionANGLE(name.ascii().data());
         m_enabledExtensions.add(name);
@@ -108 +111 @@
 String ExtensionsGLANGLE::getTranslatedShaderSourceANGLE(PlatformGLObject shader)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return String();
+
     int sourceLength = 0;
     m_context->getShaderiv(shader, GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE, &sourceLength);
@@ -162 +167 @@
 {
     // FIXME: consider adding support for APPLE_framebuffer_multisample.
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::BlitFramebufferANGLE(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
@@ -168 +175 @@
 void ExtensionsGLANGLE::renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::RenderbufferStorageMultisampleANGLE(target, samples, internalformat, width, height);
 }
@@ -174 +183 @@
 PlatformGLObject ExtensionsGLANGLE::createVertexArrayOES()
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return 0;
+
     GLuint array = 0;
     gl::GenVertexArraysOES(1, &array);
@@ -185 +196 @@
         return;
 
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::DeleteVertexArraysOES(1, &array);
 }
@@ -194 +207 @@
         return GL_FALSE;
 
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsVertexArrayOES(array);
 }
@@ -200 +215 @@
 void ExtensionsGLANGLE::bindVertexArrayOES(PlatformGLObject array)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::BindVertexArrayOES(array);
 }
@@ -229 +246 @@
 void ExtensionsGLANGLE::drawBuffersEXT(GCGLsizei n, const GCGLenum* bufs)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::DrawBuffersEXT(n, bufs);
 }
@@ -235 +254 @@
 void ExtensionsGLANGLE::drawArraysInstanced(GCGLenum mode, GCGLint first, GCGLsizei count, GCGLsizei primcount)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::DrawArraysInstancedANGLE(mode, first, count, primcount);
 }
@@ -241 +262 @@
 void ExtensionsGLANGLE::drawElementsInstanced(GCGLenum mode, GCGLsizei count, GCGLenum type, long long offset, GCGLsizei primcount)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::DrawElementsInstancedANGLE(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
 }
@@ -247 +270 @@
 void ExtensionsGLANGLE::vertexAttribDivisor(GCGLuint index, GCGLuint divisor)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::VertexAttribDivisorANGLE(index, divisor);
 }
@@ -272 +297 @@
 void ExtensionsGLANGLE::getBooleanvRobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLboolean *data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetBooleanvRobustANGLE(pname, bufSize, length, data);
 }
@@ -278 +305 @@
 void ExtensionsGLANGLE::getBufferParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetBufferParameterivRobustANGLE(target, pname, bufSize, length, params);
 }
@@ -284 +313 @@
 void ExtensionsGLANGLE::getFloatvRobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetFloatvRobustANGLE(pname, bufSize, length, data);
 }
@@ -290 +321 @@
 void ExtensionsGLANGLE::getFramebufferAttachmentParameterivRobustANGLE(GCGLenum target, GCGLenum attachment, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetFramebufferAttachmentParameterivRobustANGLE(target, attachment, pname, bufSize, length, params);
 }
@@ -296 +329 @@
 void ExtensionsGLANGLE::getIntegervRobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetIntegervRobustANGLE(pname, bufSize, length, data);
 }
@@ -302 +337 @@
 void ExtensionsGLANGLE::getProgramivRobustANGLE(GCGLuint program, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetProgramivRobustANGLE(program, pname, bufSize, length, params);
 }
@@ -308 +345 @@
 void ExtensionsGLANGLE::getRenderbufferParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetRenderbufferParameterivRobustANGLE(target, pname, bufSize, length, params);
 }
@@ -314 +353 @@
 void ExtensionsGLANGLE::getShaderivRobustANGLE(GCGLuint shader, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetShaderivRobustANGLE(shader, pname, bufSize, length, params);
 }
@@ -320 +361 @@
 void ExtensionsGLANGLE::getTexParameterfvRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetTexParameterfvRobustANGLE(target, pname, bufSize, length, params);
 }
@@ -326 +369 @@
 void ExtensionsGLANGLE::getTexParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetTexParameterivRobustANGLE(target, pname, bufSize, length, params);
 }
@@ -332 +377 @@
 void ExtensionsGLANGLE::getUniformfvRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetUniformfvRobustANGLE(program, location, bufSize, length, params);
 }
@@ -338 +385 @@
 void ExtensionsGLANGLE::getUniformivRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetUniformivRobustANGLE(program, location, bufSize, length, params);
 }
@@ -344 +393 @@
 void ExtensionsGLANGLE::getVertexAttribfvRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetVertexAttribfvRobustANGLE(index, pname, bufSize, length, params);
 }
@@ -350 +401 @@
 void ExtensionsGLANGLE::getVertexAttribivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetVertexAttribivRobustANGLE(index, pname, bufSize, length, params);
 }
@@ -356 +409 @@
 void ExtensionsGLANGLE::getVertexAttribPointervRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, void **pointer)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetVertexAttribPointervRobustANGLE(index, pname, bufSize, length, pointer);
 }
@@ -362 +417 @@
 void ExtensionsGLANGLE::readPixelsRobustANGLE(int x, int y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei *length, GCGLsizei *columns, GCGLsizei *rows, void *pixels)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::ReadPixelsRobustANGLE(x, y, width, height, format, type, bufSize, length, columns, rows, pixels);
 }
@@ -370 +427 @@
     if (!m_context->m_isForWebGL2)
         internalformat = adjustWebGL1TextureInternalFormat(internalformat, format, type);
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::TexImage2DRobustANGLE(target, level, internalformat, width, height, border, format, type, bufSize, pixels);
 }
@@ -376 +435 @@
 void ExtensionsGLANGLE::texParameterfvRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::TexParameterfvRobustANGLE(target, pname, bufSize, params);
 }
@@ -382 +443 @@
 void ExtensionsGLANGLE::texParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::TexParameterivRobustANGLE(target, pname, bufSize, params);
 }
@@ -388 +451 @@
 void ExtensionsGLANGLE::texSubImage2DRobustANGLE(GCGLenum target, int level, int xoffset, int yoffset, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, const void *pixels)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::TexSubImage2DRobustANGLE(target, level, xoffset, yoffset, width, height, format, type, bufSize, pixels);
 }
@@ -394 +459 @@
 void ExtensionsGLANGLE::compressedTexImage2DRobustANGLE(GCGLenum target, int level, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, int border, GCGLsizei imageSize, GCGLsizei bufSize, const void* data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::CompressedTexImage2DRobustANGLE(target, level, internalformat, width, height, border, imageSize, bufSize, data);
 }
@@ -400 +467 @@
 void ExtensionsGLANGLE::compressedTexSubImage2DRobustANGLE(GCGLenum target, int level, int xoffset, int yoffset, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLsizei imageSize, GCGLsizei bufSize, const void* data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::CompressedTexSubImage2DRobustANGLE(target, level, xoffset, yoffset, width, height, format, imageSize, bufSize, data);
 }
@@ -406 +475 @@
 void ExtensionsGLANGLE::compressedTexImage3DRobustANGLE(GCGLenum target, int level, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLsizei depth, int border, GCGLsizei imageSize, GCGLsizei bufSize, const void* data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::CompressedTexImage3DRobustANGLE(target, level, internalformat, width, height, depth, border, imageSize, bufSize, data);
 }
@@ -412 +483 @@
 void ExtensionsGLANGLE::compressedTexSubImage3DRobustANGLE(GCGLenum target, int level, int xoffset, int yoffset, int zoffset, GCGLsizei width, GCGLsizei height, GCGLsizei depth, GCGLenum format, GCGLsizei imageSize, GCGLsizei bufSize, const void* data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::CompressedTexSubImage3DRobustANGLE(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bufSize, data);
 }
@@ -419 +492 @@
 void ExtensionsGLANGLE::texImage3DRobustANGLE(GCGLenum target, int level, int internalformat, GCGLsizei width, GCGLsizei height, GCGLsizei depth, int border, GCGLenum format, GCGLenum type, GCGLsizei bufSize, const void *pixels)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::TexImage3DRobustANGLE(target, level, internalformat, width, height, depth, border, format, type, bufSize, pixels);
 }
@@ -425 +500 @@
 void ExtensionsGLANGLE::texSubImage3DRobustANGLE(GCGLenum target, int level, int xoffset, int yoffset, int zoffset, GCGLsizei width, GCGLsizei height, GCGLsizei depth, GCGLenum format, GCGLenum type, GCGLsizei bufSize, const void *pixels)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::TexSubImage3DRobustANGLE(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, bufSize, pixels);
 }
@@ -431 +508 @@
 void ExtensionsGLANGLE::getQueryivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetQueryivRobustANGLE(target, pname, bufSize, length, params);
 }
@@ -437 +516 @@
 void ExtensionsGLANGLE::getQueryObjectuivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetQueryObjectuivRobustANGLE(id, pname, bufSize, length, params);
 }
@@ -443 +524 @@
 void ExtensionsGLANGLE::getBufferPointervRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, void **params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetBufferPointervRobustANGLE(target, pname, bufSize, length, params);
 }
@@ -449 +532 @@
 void ExtensionsGLANGLE::getIntegeri_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLint *data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetIntegeri_vRobustANGLE(target, index, bufSize, length, data);
 }
@@ -455 +540 @@
 void ExtensionsGLANGLE::getInternalformativRobustANGLE(GCGLenum target, GCGLenum internalformat, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetInternalformativRobustANGLE(target, internalformat, pname, bufSize, length, params);
 }
@@ -461 +548 @@
 void ExtensionsGLANGLE::getVertexAttribIivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetVertexAttribIivRobustANGLE(index, pname, bufSize, length, params);
 }
@@ -467 +556 @@
 void ExtensionsGLANGLE::getVertexAttribIuivRobustANGLE(GCGLuint index, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetVertexAttribIuivRobustANGLE(index, pname, bufSize, length, params);
 }
@@ -473 +564 @@
 void ExtensionsGLANGLE::getUniformuivRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetUniformuivRobustANGLE(program, location, bufSize, length, params);
 }
@@ -479 +572 @@
 void ExtensionsGLANGLE::getActiveUniformBlockivRobustANGLE(GCGLuint program, GCGLuint uniformBlockIndex, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetActiveUniformBlockivRobustANGLE(program, uniformBlockIndex, pname, bufSize, length, params);
 }
@@ -485 +580 @@
 void ExtensionsGLANGLE::getInteger64vRobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetInteger64vRobustANGLE(pname, bufSize, length, reinterpret_cast<GLint64*>(data));
 }
@@ -491 +588 @@
 void ExtensionsGLANGLE::getInteger64i_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetInteger64i_vRobustANGLE(target, index, bufSize, length, reinterpret_cast<GLint64*>(data));
 }
@@ -497 +596 @@
 void ExtensionsGLANGLE::getBufferParameteri64vRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetBufferParameteri64vRobustANGLE(target, pname, bufSize, length, reinterpret_cast<GLint64*>(params));
 }
@@ -503 +604 @@
 void ExtensionsGLANGLE::samplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint *param)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::SamplerParameterivRobustANGLE(sampler, pname, bufSize, param);
 }
@@ -509 +612 @@
 void ExtensionsGLANGLE::samplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLfloat *param)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::SamplerParameterfvRobustANGLE(sampler, pname, bufSize, param);
 }
@@ -515 +620 @@
 void ExtensionsGLANGLE::getSamplerParameterivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetSamplerParameterivRobustANGLE(sampler, pname, bufSize, length, params);
 }
@@ -521 +628 @@
 void ExtensionsGLANGLE::getSamplerParameterfvRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetSamplerParameterfvRobustANGLE(sampler, pname, bufSize, length, params);
 }
@@ -528 +637 @@
 void ExtensionsGLANGLE::getFramebufferParameterivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetFramebufferParameterivRobustANGLE(target, pname, bufSize, length, params);
 }
@@ -534 +645 @@
 void ExtensionsGLANGLE::getProgramInterfaceivRobustANGLE(GCGLuint program, GCGLenum programInterface, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetProgramInterfaceivRobustANGLE(program, programInterface, pname, bufSize, length, params);
 }
@@ -540 +653 @@
 void ExtensionsGLANGLE::getBooleani_vRobustANGLE(GCGLenum target, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLboolean *data)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetBooleani_vRobustANGLE(target, index, bufSize, length, data);
 }
@@ -546 +661 @@
 void ExtensionsGLANGLE::getMultisamplefvRobustANGLE(GCGLenum pname, GCGLuint index, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *val)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetMultisamplefvRobustANGLE(pname, index, bufSize, length, val);
 }
@@ -552 +669 @@
 void ExtensionsGLANGLE::getTexLevelParameterivRobustANGLE(GCGLenum target, int level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetTexLevelParameterivRobustANGLE(target, level, pname, bufSize, length, params);
 }
@@ -558 +677 @@
 void ExtensionsGLANGLE::getTexLevelParameterfvRobustANGLE(GCGLenum target, int level, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetTexLevelParameterfvRobustANGLE(target, level, pname, bufSize, length, params);
 }
@@ -565 +686 @@
 void ExtensionsGLANGLE::getPointervRobustANGLERobustANGLE(GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, void **params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetPointervRobustANGLERobustANGLE(pname, bufSize, length, params);
 }
@@ -582 +705 @@
 void ExtensionsGLANGLE::readnPixelsRobustANGLE(int x, int y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, GCGLsizei bufSize, GCGLsizei *length, GCGLsizei *columns, GCGLsizei *rows, void *data, bool readingToPixelBufferObject)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     // FIXME: remove the two glFlush calls when the driver bug is fixed, i.e.,
     // all previous rendering calls should be done before reading pixels.
@@ -617 +742 @@
 void ExtensionsGLANGLE::getnUniformfvRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLfloat *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetnUniformfvRobustANGLE(program, location, bufSize, length, params);
 }
@@ -623 +750 @@
 void ExtensionsGLANGLE::getnUniformivRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetnUniformivRobustANGLE(program, location, bufSize, length, params);
 }
@@ -629 +758 @@
 void ExtensionsGLANGLE::getnUniformuivRobustANGLE(GCGLuint program, int location, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetnUniformuivRobustANGLE(program, location, bufSize, length, params);
 }
@@ -635 +766 @@
 void ExtensionsGLANGLE::texParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::TexParameterIivRobustANGLE(target, pname, bufSize, params);
 }
@@ -641 +774 @@
 void ExtensionsGLANGLE::texParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, const GCGLuint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::TexParameterIuivRobustANGLE(target, pname, bufSize, params);
 }
@@ -647 +782 @@
 void ExtensionsGLANGLE::getTexParameterIivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetTexParameterIivRobustANGLE(target, pname, bufSize, length, params);
 }
@@ -653 +790 @@
 void ExtensionsGLANGLE::getTexParameterIuivRobustANGLE(GCGLenum target, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetTexParameterIuivRobustANGLE(target, pname, bufSize, length, params);
 }
@@ -659 +798 @@
 void ExtensionsGLANGLE::samplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLint *param)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::SamplerParameterIivRobustANGLE(sampler, pname, bufSize, param);
 }
@@ -665 +806 @@
 void ExtensionsGLANGLE::samplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, const GCGLuint *param)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::SamplerParameterIuivRobustANGLE(sampler, pname, bufSize, param);
 }
@@ -671 +814 @@
 void ExtensionsGLANGLE::getSamplerParameterIivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetSamplerParameterIivRobustANGLE(sampler, pname, bufSize, length, params);
 }
@@ -677 +822 @@
 void ExtensionsGLANGLE::getSamplerParameterIuivRobustANGLE(GCGLuint sampler, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetSamplerParameterIuivRobustANGLE(sampler, pname, bufSize, length, params);
 }
@@ -684 +831 @@
 void ExtensionsGLANGLE::getQueryObjectivRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetQueryObjectivRobustANGLE(id, pname, bufSize, length, params);
 }
@@ -690 +839 @@
 void ExtensionsGLANGLE::getQueryObjecti64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLint64 *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetQueryObjecti64vRobustANGLE(id, pname, bufSize, length, reinterpret_cast<GLint64*>(params));
 }
@@ -696 +847 @@
 void ExtensionsGLANGLE::getQueryObjectui64vRobustANGLE(GCGLuint id, GCGLenum pname, GCGLsizei bufSize, GCGLsizei *length, GCGLuint64 *params)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     gl::GetQueryObjectui64vRobustANGLE(id, pname, bufSize, length, reinterpret_cast<GLuint64*>(params));
 }

trunk/Source/WebCore/platform/graphics/angle/GraphicsContextGLANGLE.cpp

@@ -186 +186 @@
         gl::BindFramebuffer(GL_FRAMEBUFFER, m_multisampleFBO);
         gl::BindRenderbuffer(GL_RENDERBUFFER, m_multisampleColorBuffer);
-        getExtensions().renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, m_internalColorFormat, width, height);
+        gl::RenderbufferStorageMultisampleANGLE(GL_RENDERBUFFER, sampleCount, m_internalColorFormat, width, height);
         gl::FramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, m_multisampleColorBuffer);
         if (attrs.stencil || attrs.depth) {
             gl::BindRenderbuffer(GL_RENDERBUFFER, m_multisampleDepthStencilBuffer);
-            getExtensions().renderbufferStorageMultisample(GL_RENDERBUFFER, sampleCount, internalDepthStencilFormat, width, height);
+            gl::RenderbufferStorageMultisampleANGLE(GL_RENDERBUFFER, sampleCount, internalDepthStencilFormat, width, height);
             // WebGL 1.0's rules state that combined depth/stencil renderbuffers
             // have to be attached to the synthetic DEPTH_STENCIL_ATTACHMENT point.
@@ -325 +325 @@
 void GraphicsContextGLOpenGL::renderbufferStorage(GCGLenum target, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::RenderbufferStorage(target, internalformat, width, height);
 }
@@ -331 +333 @@
 void GraphicsContextGLOpenGL::getIntegerv(GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     switch (pname) {
     case MAX_TEXTURE_SIZE:
@@ -364 +368 @@
 void GraphicsContextGLOpenGL::getIntegeri_v(GCGLenum pname, GCGLuint index, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetIntegeri_v(pname, index, value);
 }
@@ -370 +376 @@
 void GraphicsContextGLOpenGL::getShaderPrecisionFormat(GCGLenum shaderType, GCGLenum precisionType, GCGLint* range, GCGLint* precision)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetShaderPrecisionFormat(shaderType, precisionType, range, precision);
 }
@@ -387 +395 @@
 void GraphicsContextGLOpenGL::depthRange(GCGLclampf zNear, GCGLclampf zFar)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DepthRangef(static_cast<float>(zNear), static_cast<float>(zFar));
 }
@@ -393 +403 @@
 void GraphicsContextGLOpenGL::clearDepth(GCGLclampf depth)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::ClearDepthf(static_cast<float>(depth));
 }
@@ -408 +420 @@
     // FIXME: remove the two glFlush calls when the driver bug is fixed, i.e.,
     // all previous rendering calls should be done before reading pixels.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Flush();
     auto attrs = contextAttributes();
@@ -523 +537 @@
         return;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     prepareTextureImpl();
 }
@@ -573 +589 @@
         return;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 
     GCGLenum framebufferTarget = m_isForWebGL2 ? GraphicsContextGL::READ_FRAMEBUFFER : GraphicsContextGL::FRAMEBUFFER;
@@ -629 +647 @@
 void GraphicsContextGLOpenGL::reshape(int width, int height)
 {
-    if (!platformGraphicsContextGL())
-        return;
-
     if (width == m_currentWidth && height == m_currentHeight)
         return;
@@ -639 +654 @@
         return;
 
+    if (!makeContextCurrent())
+        return;
+
+    // FIXME: these may call makeContextCurrent again, we need to do this before changing the size.
+    moveErrorsToSyntheticErrorList();
+    validateAttributes();
+
     markContextChanged();
 
     m_currentWidth = width;
     m_currentHeight = height;
-
-    makeContextCurrent();
-    moveErrorsToSyntheticErrorList();
-    validateAttributes();
 
     TemporaryANGLESetting scopedScissor(GL_SCISSOR_TEST, GL_FALSE);
@@ -667 +685 @@
     if (attrs.depth) {
         gl::GetFloatv(GL_DEPTH_CLEAR_VALUE, &clearDepth);
-        GraphicsContextGLOpenGL::clearDepth(1);
+        gl::ClearDepthf(1.0f);
         gl::GetBooleanv(GL_DEPTH_WRITEMASK, &depthMask);
         gl::DepthMask(GL_TRUE);
         clearMask |= GL_DEPTH_BUFFER_BIT;
     }
+
     if (attrs.stencil) {
         gl::GetIntegerv(GL_STENCIL_CLEAR_VALUE, &clearStencil);
@@ -687 +706 @@
     gl::ColorMask(colorMask[0], colorMask[1], colorMask[2], colorMask[3]);
     if (attrs.depth) {
-        GraphicsContextGLOpenGL::clearDepth(clearDepth);
+        gl::ClearDepthf(clearDepth);
         gl::DepthMask(depthMask);
     }
@@ -714 +733 @@
 void GraphicsContextGLOpenGL::activeTexture(GCGLenum texture)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     m_state.activeTextureUnit = texture;
     gl::ActiveTexture(texture);
@@ -723 +744 @@
     ASSERT(program);
     ASSERT(shader);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::AttachShader(program, shader);
 }
@@ -730 +753 @@
 {
     ASSERT(program);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BindAttribLocation(program, index, name.utf8().data());
 }
@@ -736 +761 @@
 void GraphicsContextGLOpenGL::bindBuffer(GCGLenum target, PlatformGLObject buffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BindBuffer(target, buffer);
 }
@@ -742 +769 @@
 void GraphicsContextGLOpenGL::bindFramebuffer(GCGLenum target, PlatformGLObject buffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     GLuint fbo;
     if (buffer)
@@ -761 +790 @@
 void GraphicsContextGLOpenGL::bindRenderbuffer(GCGLenum target, PlatformGLObject renderbuffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BindRenderbuffer(target, renderbuffer);
 }
@@ -768 +799 @@
 void GraphicsContextGLOpenGL::bindTexture(GCGLenum target, PlatformGLObject texture)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     m_state.setBoundTexture(m_state.activeTextureUnit, texture, target);
     gl::BindTexture(target, texture);
@@ -775 +808 @@
 void GraphicsContextGLOpenGL::blendColor(GCGLclampf red, GCGLclampf green, GCGLclampf blue, GCGLclampf alpha)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BlendColor(red, green, blue, alpha);
 }
@@ -781 +816 @@
 void GraphicsContextGLOpenGL::blendEquation(GCGLenum mode)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BlendEquation(mode);
 }
@@ -787 +824 @@
 void GraphicsContextGLOpenGL::blendEquationSeparate(GCGLenum modeRGB, GCGLenum modeAlpha)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BlendEquationSeparate(modeRGB, modeAlpha);
 }
@@ -794 +833 @@
 void GraphicsContextGLOpenGL::blendFunc(GCGLenum sfactor, GCGLenum dfactor)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BlendFunc(sfactor, dfactor);
 }
@@ -800 +841 @@
 void GraphicsContextGLOpenGL::blendFuncSeparate(GCGLenum srcRGB, GCGLenum dstRGB, GCGLenum srcAlpha, GCGLenum dstAlpha)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
@@ -806 +849 @@
 void GraphicsContextGLOpenGL::bufferData(GCGLenum target, GCGLsizeiptr size, GCGLenum usage)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BufferData(target, size, 0, usage);
 }
@@ -812 +857 @@
 void GraphicsContextGLOpenGL::bufferData(GCGLenum target, GCGLsizeiptr size, const void* data, GCGLenum usage)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BufferData(target, size, data, usage);
 }
@@ -818 +865 @@
 void GraphicsContextGLOpenGL::bufferSubData(GCGLenum target, GCGLintptr offset, GCGLsizeiptr size, const void* data)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BufferSubData(target, offset, size, data);
 }
@@ -824 +873 @@
 void* GraphicsContextGLOpenGL::mapBufferRange(GCGLenum target, GCGLintptr offset, GCGLsizeiptr length, GCGLbitfield access)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return nullptr;
+
     return gl::MapBufferRange(target, offset, length, access);
 }
@@ -830 +881 @@
 GCGLboolean GraphicsContextGLOpenGL::unmapBuffer(GCGLenum target)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::UnmapBuffer(target);
 }
@@ -836 +889 @@
 void GraphicsContextGLOpenGL::copyBufferSubData(GCGLenum readTarget, GCGLenum writeTarget, GCGLintptr readOffset, GCGLintptr writeOffset, GCGLsizeiptr size)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
@@ -842 +897 @@
 void GraphicsContextGLOpenGL::getInternalformativ(GCGLenum target, GCGLenum internalformat, GCGLenum pname, GCGLsizei bufSize, GCGLint* params)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetInternalformativ(target, internalformat, pname, bufSize, params);
 }
@@ -848 +905 @@
 void GraphicsContextGLOpenGL::renderbufferStorageMultisample(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
@@ -854 +913 @@
 void GraphicsContextGLOpenGL::texStorage2D(GCGLenum target, GCGLsizei levels, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::TexStorage2D(target, levels, internalformat, width, height);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -861 +922 @@
 void GraphicsContextGLOpenGL::texStorage3D(GCGLenum target, GCGLsizei levels, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLsizei depth)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::TexStorage3D(target, levels, internalformat, width, height, depth);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -869 +932 @@
 {
     ASSERT(program);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 
     gl::GetActiveUniformsiv(program, uniformIndices.size(), uniformIndices.data(), pname, params.data());
@@ -876 +941 @@
 GCGLenum GraphicsContextGLOpenGL::checkFramebufferStatus(GCGLenum target)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_INVALID_OPERATION;
+
     return gl::CheckFramebufferStatus(target);
 }
@@ -882 +949 @@
 void GraphicsContextGLOpenGL::clearColor(GCGLclampf r, GCGLclampf g, GCGLclampf b, GCGLclampf a)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::ClearColor(r, g, b, a);
 }
@@ -888 +957 @@
 void GraphicsContextGLOpenGL::clear(GCGLbitfield mask)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Clear(mask);
     checkGPUStatus();
@@ -895 +966 @@
 void GraphicsContextGLOpenGL::clearStencil(GCGLint s)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::ClearStencil(s);
 }
@@ -901 +974 @@
 void GraphicsContextGLOpenGL::colorMask(GCGLboolean red, GCGLboolean green, GCGLboolean blue, GCGLboolean alpha)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::ColorMask(red, green, blue, alpha);
 }
@@ -908 +983 @@
 {
     ASSERT(shader);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     // We need the ANGLE_texture_rectangle extension to support IOSurface
     // backbuffers, but we don't want it exposed to WebGL user shaders.
@@ -920 +997 @@
 {
     ASSERT(shader);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::CompileShader(shader);
 }
@@ -926 +1005 @@
 void GraphicsContextGLOpenGL::copyTexImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLint border)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     auto attrs = contextAttributes();
     GCGLenum framebufferTarget = m_isForWebGL2 ? GraphicsContextGL::READ_FRAMEBUFFER : GraphicsContextGL::FRAMEBUFFER;
@@ -941 +1022 @@
 void GraphicsContextGLOpenGL::copyTexSubImage2D(GCGLenum target, GCGLint level, GCGLint xoffset, GCGLint yoffset, GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     auto attrs = contextAttributes();
     GCGLenum framebufferTarget = m_isForWebGL2 ? GraphicsContextGL::READ_FRAMEBUFFER : GraphicsContextGL::FRAMEBUFFER;
@@ -956 +1039 @@
 void GraphicsContextGLOpenGL::cullFace(GCGLenum mode)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::CullFace(mode);
 }
@@ -962 +1047 @@
 void GraphicsContextGLOpenGL::depthFunc(GCGLenum func)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DepthFunc(func);
 }
@@ -968 +1055 @@
 void GraphicsContextGLOpenGL::depthMask(GCGLboolean flag)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DepthMask(flag);
 }
@@ -976 +1065 @@
     ASSERT(program);
     ASSERT(shader);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DetachShader(program, shader);
 }
@@ -982 +1073 @@
 void GraphicsContextGLOpenGL::disable(GCGLenum cap)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Disable(cap);
 }
@@ -988 +1081 @@
 void GraphicsContextGLOpenGL::disableVertexAttribArray(GCGLuint index)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DisableVertexAttribArray(index);
 }
@@ -994 +1089 @@
 void GraphicsContextGLOpenGL::drawArrays(GCGLenum mode, GCGLint first, GCGLsizei count)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DrawArrays(mode, first, count);
     checkGPUStatus();
@@ -1001 +1098 @@
 void GraphicsContextGLOpenGL::drawElements(GCGLenum mode, GCGLsizei count, GCGLenum type, GCGLintptr offset)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DrawElements(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)));
     checkGPUStatus();
@@ -1008 +1107 @@
 void GraphicsContextGLOpenGL::enable(GCGLenum cap)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Enable(cap);
 }
@@ -1014 +1115 @@
 void GraphicsContextGLOpenGL::enableVertexAttribArray(GCGLuint index)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::EnableVertexAttribArray(index);
 }
@@ -1020 +1123 @@
 void GraphicsContextGLOpenGL::finish()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Finish();
 }
@@ -1026 +1131 @@
 void GraphicsContextGLOpenGL::flush()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Flush();
 }
@@ -1032 +1139 @@
 void GraphicsContextGLOpenGL::framebufferRenderbuffer(GCGLenum target, GCGLenum attachment, GCGLenum renderbuffertarget, PlatformGLObject buffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::FramebufferRenderbuffer(target, attachment, renderbuffertarget, buffer);
 }
@@ -1038 +1147 @@
 void GraphicsContextGLOpenGL::framebufferTexture2D(GCGLenum target, GCGLenum attachment, GCGLenum textarget, PlatformGLObject texture, GCGLint level)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::FramebufferTexture2D(target, attachment, textarget, texture, level);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -1045 +1156 @@
 void GraphicsContextGLOpenGL::frontFace(GCGLenum mode)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::FrontFace(mode);
 }
@@ -1051 +1164 @@
 void GraphicsContextGLOpenGL::generateMipmap(GCGLenum target)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GenerateMipmap(target);
 }
@@ -1061 +1176 @@
         return false;
     }
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return false;
+
     GLint maxAttributeSize = 0;
     gl::GetProgramiv(program, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &maxAttributeSize);
@@ -1090 +1207 @@
     }
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return false;
+
     GLint maxUniformSize = 0;
     gl::GetProgramiv(program, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxUniformSize);
@@ -1119 +1238 @@
         return;
     }
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetAttachedShaders(program, maxCount, count, shaders);
 }
@@ -1128 +1249 @@
         return -1;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return -1;
+
 
     return gl::GetAttribLocation(program, name.utf8().data());
@@ -1140 +1263 @@
 bool GraphicsContextGLOpenGL::moveErrorsToSyntheticErrorList()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return false;
+
     bool movedAnError = false;
 
@@ -1167 +1292 @@
     }
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_INVALID_OPERATION;
+
     return gl::GetError();
 }
@@ -1173 +1300 @@
 String GraphicsContextGLOpenGL::getString(GCGLenum name)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return String();
+
     return String(reinterpret_cast<const char*>(gl::GetString(name)));
 }
@@ -1179 +1308 @@
 void GraphicsContextGLOpenGL::hint(GCGLenum target, GCGLenum mode)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Hint(target, mode);
 }
@@ -1188 +1319 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsBuffer(buffer);
 }
@@ -1194 +1327 @@
 GCGLboolean GraphicsContextGLOpenGL::isEnabled(GCGLenum cap)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsEnabled(cap);
 }
@@ -1203 +1338 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsFramebuffer(framebuffer);
 }
@@ -1212 +1349 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsProgram(program);
 }
@@ -1221 +1360 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsRenderbuffer(renderbuffer);
 }
@@ -1230 +1371 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsShader(shader);
 }
@@ -1239 +1382 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsTexture(texture);
 }
@@ -1245 +1390 @@
 void GraphicsContextGLOpenGL::lineWidth(GCGLfloat width)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::LineWidth(width);
 }
@@ -1252 +1399 @@
 {
     ASSERT(program);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::LinkProgram(program);
 }
@@ -1258 +1407 @@
 void GraphicsContextGLOpenGL::pixelStorei(GCGLenum pname, GCGLint param)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::PixelStorei(pname, param);
 }
@@ -1264 +1415 @@
 void GraphicsContextGLOpenGL::polygonOffset(GCGLfloat factor, GCGLfloat units)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::PolygonOffset(factor, units);
 }
@@ -1270 +1423 @@
 void GraphicsContextGLOpenGL::sampleCoverage(GCGLclampf value, GCGLboolean invert)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::SampleCoverage(value, invert);
 }
@@ -1276 +1431 @@
 void GraphicsContextGLOpenGL::scissor(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Scissor(x, y, width, height);
 }
@@ -1284 +1441 @@
     ASSERT(shader);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
 
     const CString& shaderSourceCString = string.utf8();
@@ -1294 +1452 @@
 void GraphicsContextGLOpenGL::stencilFunc(GCGLenum func, GCGLint ref, GCGLuint mask)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::StencilFunc(func, ref, mask);
 }
@@ -1300 +1460 @@
 void GraphicsContextGLOpenGL::stencilFuncSeparate(GCGLenum face, GCGLenum func, GCGLint ref, GCGLuint mask)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::StencilFuncSeparate(face, func, ref, mask);
 }
@@ -1306 +1468 @@
 void GraphicsContextGLOpenGL::stencilMask(GCGLuint mask)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::StencilMask(mask);
 }
@@ -1312 +1476 @@
 void GraphicsContextGLOpenGL::stencilMaskSeparate(GCGLenum face, GCGLuint mask)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::StencilMaskSeparate(face, mask);
 }
@@ -1318 +1484 @@
 void GraphicsContextGLOpenGL::stencilOp(GCGLenum fail, GCGLenum zfail, GCGLenum zpass)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::StencilOp(fail, zfail, zpass);
 }
@@ -1324 +1492 @@
 void GraphicsContextGLOpenGL::stencilOpSeparate(GCGLenum face, GCGLenum fail, GCGLenum zfail, GCGLenum zpass)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::StencilOpSeparate(face, fail, zfail, zpass);
 }
@@ -1330 +1500 @@
 void GraphicsContextGLOpenGL::texParameterf(GCGLenum target, GCGLenum pname, GCGLfloat value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::TexParameterf(target, pname, value);
 }
@@ -1336 +1508 @@
 void GraphicsContextGLOpenGL::texParameteri(GCGLenum target, GCGLenum pname, GCGLint value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::TexParameteri(target, pname, value);
 }
@@ -1342 +1516 @@
 void GraphicsContextGLOpenGL::uniform1f(GCGLint location, GCGLfloat v0)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform1f(location, v0);
 }
@@ -1348 +1524 @@
 void GraphicsContextGLOpenGL::uniform1fv(GCGLint location, GCGLsizei size, const GCGLfloat* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform1fv(location, size, array);
 }
@@ -1354 +1532 @@
 void GraphicsContextGLOpenGL::uniform2f(GCGLint location, GCGLfloat v0, GCGLfloat v1)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform2f(location, v0, v1);
 }
@@ -1361 +1541 @@
 {
     // FIXME: length needs to be a multiple of 2.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform2fv(location, size, array);
 }
@@ -1367 +1549 @@
 void GraphicsContextGLOpenGL::uniform3f(GCGLint location, GCGLfloat v0, GCGLfloat v1, GCGLfloat v2)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform3f(location, v0, v1, v2);
 }
@@ -1374 +1558 @@
 {
     // FIXME: length needs to be a multiple of 3.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform3fv(location, size, array);
 }
@@ -1380 +1566 @@
 void GraphicsContextGLOpenGL::uniform4f(GCGLint location, GCGLfloat v0, GCGLfloat v1, GCGLfloat v2, GCGLfloat v3)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform4f(location, v0, v1, v2, v3);
 }
@@ -1387 +1575 @@
 {
     // FIXME: length needs to be a multiple of 4.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform4fv(location, size, array);
 }
@@ -1393 +1583 @@
 void GraphicsContextGLOpenGL::uniform1i(GCGLint location, GCGLint v0)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform1i(location, v0);
 }
@@ -1399 +1591 @@
 void GraphicsContextGLOpenGL::uniform1iv(GCGLint location, GCGLsizei size, const GCGLint* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform1iv(location, size, array);
 }
@@ -1405 +1599 @@
 void GraphicsContextGLOpenGL::uniform2i(GCGLint location, GCGLint v0, GCGLint v1)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform2i(location, v0, v1);
 }
@@ -1412 +1608 @@
 {
     // FIXME: length needs to be a multiple of 2.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform2iv(location, size, array);
 }
@@ -1418 +1616 @@
 void GraphicsContextGLOpenGL::uniform3i(GCGLint location, GCGLint v0, GCGLint v1, GCGLint v2)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform3i(location, v0, v1, v2);
 }
@@ -1425 +1625 @@
 {
     // FIXME: length needs to be a multiple of 3.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform3iv(location, size, array);
 }
@@ -1431 +1633 @@
 void GraphicsContextGLOpenGL::uniform4i(GCGLint location, GCGLint v0, GCGLint v1, GCGLint v2, GCGLint v3)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform4i(location, v0, v1, v2, v3);
 }
@@ -1438 +1642 @@
 {
     // FIXME: length needs to be a multiple of 4.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform4iv(location, size, array);
 }
@@ -1445 +1651 @@
 {
     // FIXME: length needs to be a multiple of 4.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix2fv(location, size, transpose, array);
 }
@@ -1452 +1660 @@
 {
     // FIXME: length needs to be a multiple of 9.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix3fv(location, size, transpose, array);
 }
@@ -1459 +1669 @@
 {
     // FIXME: length needs to be a multiple of 16.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix4fv(location, size, transpose, array);
 }
@@ -1465 +1677 @@
 void GraphicsContextGLOpenGL::useProgram(PlatformGLObject program)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UseProgram(program);
 }
@@ -1473 +1687 @@
     ASSERT(program);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::ValidateProgram(program);
 }
@@ -1479 +1695 @@
 void GraphicsContextGLOpenGL::vertexAttrib1f(GCGLuint index, GCGLfloat v0)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttrib1f(index, v0);
 }
@@ -1485 +1703 @@
 void GraphicsContextGLOpenGL::vertexAttrib1fv(GCGLuint index, const GCGLfloat* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttrib1fv(index, array);
 }
@@ -1491 +1711 @@
 void GraphicsContextGLOpenGL::vertexAttrib2f(GCGLuint index, GCGLfloat v0, GCGLfloat v1)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttrib2f(index, v0, v1);
 }
@@ -1497 +1719 @@
 void GraphicsContextGLOpenGL::vertexAttrib2fv(GCGLuint index, const GCGLfloat* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttrib2fv(index, array);
 }
@@ -1503 +1727 @@
 void GraphicsContextGLOpenGL::vertexAttrib3f(GCGLuint index, GCGLfloat v0, GCGLfloat v1, GCGLfloat v2)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttrib3f(index, v0, v1, v2);
 }
@@ -1509 +1735 @@
 void GraphicsContextGLOpenGL::vertexAttrib3fv(GCGLuint index, const GCGLfloat* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttrib3fv(index, array);
 }
@@ -1515 +1743 @@
 void GraphicsContextGLOpenGL::vertexAttrib4f(GCGLuint index, GCGLfloat v0, GCGLfloat v1, GCGLfloat v2, GCGLfloat v3)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttrib4f(index, v0, v1, v2, v3);
 }
@@ -1521 +1751 @@
 void GraphicsContextGLOpenGL::vertexAttrib4fv(GCGLuint index, const GCGLfloat* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttrib4fv(index, array);
 }
@@ -1527 +1759 @@
 void GraphicsContextGLOpenGL::vertexAttribPointer(GCGLuint index, GCGLint size, GCGLenum type, GCGLboolean normalized, GCGLsizei stride, GCGLintptr offset)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttribPointer(index, size, type, normalized, stride, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)));
 }
@@ -1533 +1767 @@
 void GraphicsContextGLOpenGL::vertexAttribIPointer(GCGLuint index, GCGLint size, GCGLenum type, GCGLsizei stride, GCGLintptr offset)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttribIPointer(index, size, type, stride, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)));
 }
@@ -1539 +1775 @@
 void GraphicsContextGLOpenGL::viewport(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Viewport(x, y, width, height);
 }
@@ -1545 +1783 @@
 PlatformGLObject GraphicsContextGLOpenGL::createVertexArray()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint array = 0;
     gl::GenVertexArrays(1, &array);
@@ -1555 +1795 @@
     if (!array)
         return;
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DeleteVertexArrays(1, &array);
 }
@@ -1563 +1805 @@
     if (!array)
         return GL_FALSE;
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsVertexArray(array);
 }
@@ -1569 +1813 @@
 void GraphicsContextGLOpenGL::bindVertexArray(PlatformGLObject array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BindVertexArray(array);
 }
@@ -1575 +1821 @@
 void GraphicsContextGLOpenGL::getBooleanv(GCGLenum pname, GCGLboolean* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetBooleanv(pname, value);
 }
@@ -1581 +1829 @@
 void GraphicsContextGLOpenGL::getBufferParameteriv(GCGLenum target, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetBufferParameteriv(target, pname, value);
 }
@@ -1587 +1837 @@
 void GraphicsContextGLOpenGL::getFloatv(GCGLenum pname, GCGLfloat* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetFloatv(pname, value);
 }
@@ -1593 +1845 @@
 void GraphicsContextGLOpenGL::getInteger64v(GCGLenum pname, GCGLint64* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     *value = 0;
     gl::GetInteger64v(pname, value);
@@ -1600 +1854 @@
 void GraphicsContextGLOpenGL::getInteger64i_v(GCGLenum pname, GCGLuint index, GCGLint64* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     *value = 0;
     gl::GetInteger64i_v(pname, index, value);
@@ -1607 +1863 @@
 void GraphicsContextGLOpenGL::getFramebufferAttachmentParameteriv(GCGLenum target, GCGLenum attachment, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     if (attachment == DEPTH_STENCIL_ATTACHMENT)
         attachment = DEPTH_ATTACHMENT; // Or STENCIL_ATTACHMENT, either works.
@@ -1615 +1873 @@
 void GraphicsContextGLOpenGL::getProgramiv(PlatformGLObject program, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetProgramiv(program, pname, value);
 }
@@ -1643 +1903 @@
     ASSERT(program);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return String();
+
     GLint length = 0;
     gl::GetProgramiv(program, GL_INFO_LOG_LENGTH, &length);
@@ -1662 +1924 @@
 void GraphicsContextGLOpenGL::getRenderbufferParameteriv(GCGLenum target, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetRenderbufferParameteriv(target, pname, value);
 }
@@ -1670 +1934 @@
     ASSERT(shader);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetShaderiv(shader, pname, value);
 }
@@ -1678 +1944 @@
     ASSERT(shader);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return String();
+
     GLint length = 0;
     gl::GetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
@@ -1699 +1967 @@
 void GraphicsContextGLOpenGL::getTexParameterfv(GCGLenum target, GCGLenum pname, GCGLfloat* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetTexParameterfv(target, pname, value);
 }
@@ -1705 +1975 @@
 void GraphicsContextGLOpenGL::getTexParameteriv(GCGLenum target, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetTexParameteriv(target, pname, value);
 }
@@ -1711 +1983 @@
 void GraphicsContextGLOpenGL::getUniformfv(PlatformGLObject program, GCGLint location, GCGLfloat* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetUniformfv(program, location, value);
 }
@@ -1717 +1991 @@
 void GraphicsContextGLOpenGL::getUniformiv(PlatformGLObject program, GCGLint location, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetUniformiv(program, location, value);
 }
@@ -1723 +1999 @@
 void GraphicsContextGLOpenGL::getUniformuiv(PlatformGLObject program, GCGLint location, GCGLuint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetUniformuiv(program, location, value);
 }
@@ -1731 +2009 @@
     ASSERT(program);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return -1;
+
     return gl::GetUniformLocation(program, name.utf8().data());
 }
@@ -1737 +2017 @@
 void GraphicsContextGLOpenGL::getVertexAttribfv(GCGLuint index, GCGLenum pname, GCGLfloat* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetVertexAttribfv(index, pname, value);
 }
@@ -1743 +2025 @@
 void GraphicsContextGLOpenGL::getVertexAttribiv(GCGLuint index, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetVertexAttribiv(index, pname, value);
 }
@@ -1749 +2033 @@
 GCGLsizeiptr GraphicsContextGLOpenGL::getVertexAttribOffset(GCGLuint index, GCGLenum pname)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
 
     GLvoid* pointer = 0;
@@ -1758 +2043 @@
 void GraphicsContextGLOpenGL::texSubImage2D(GCGLenum target, GCGLint level, GCGLint xoff, GCGLint yoff, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, const void* pixels)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
 
     // FIXME: we will need to deal with PixelStore params when dealing with image buffers that differ from the subimage size.
@@ -1767 +2053 @@
 void GraphicsContextGLOpenGL::compressedTexImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLint border, GCGLsizei imageSize, const void* data)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -1774 +2062 @@
 void GraphicsContextGLOpenGL::compressedTexSubImage2D(GCGLenum target, GCGLint level, GCGLint xoffset, GCGLint yoffset, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLsizei imageSize, const void* data)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -1781 +2071 @@
 PlatformGLObject GraphicsContextGLOpenGL::createBuffer()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint o = 0;
     gl::GenBuffers(1, &o);
@@ -1789 +2081 @@
 PlatformGLObject GraphicsContextGLOpenGL::createFramebuffer()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint o = 0;
     gl::GenFramebuffers(1, &o);
@@ -1797 +2091 @@
 PlatformGLObject GraphicsContextGLOpenGL::createProgram()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     return gl::CreateProgram();
 }
@@ -1803 +2099 @@
 PlatformGLObject GraphicsContextGLOpenGL::createRenderbuffer()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint o = 0;
     gl::GenRenderbuffers(1, &o);
@@ -1811 +2109 @@
 PlatformGLObject GraphicsContextGLOpenGL::createShader(GCGLenum type)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     return gl::CreateShader((type == FRAGMENT_SHADER) ? GL_FRAGMENT_SHADER : GL_VERTEX_SHADER);
 }
@@ -1817 +2117 @@
 PlatformGLObject GraphicsContextGLOpenGL::createTexture()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint o = 0;
     gl::GenTextures(1, &o);
@@ -1826 +2128 @@
 void GraphicsContextGLOpenGL::deleteBuffer(PlatformGLObject buffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DeleteBuffers(1, &buffer);
 }
@@ -1832 +2136 @@
 void GraphicsContextGLOpenGL::deleteFramebuffer(PlatformGLObject framebuffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     // Make sure the framebuffer is not going to be used for drawing
     // operations after it gets deleted.
@@ -1847 +2153 @@
 void GraphicsContextGLOpenGL::deleteProgram(PlatformGLObject program)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DeleteProgram(program);
 }
@@ -1853 +2161 @@
 void GraphicsContextGLOpenGL::deleteRenderbuffer(PlatformGLObject renderbuffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DeleteRenderbuffers(1, &renderbuffer);
 }
@@ -1859 +2169 @@
 void GraphicsContextGLOpenGL::deleteShader(PlatformGLObject shader)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DeleteShader(shader);
 }
@@ -1865 +2177 @@
 void GraphicsContextGLOpenGL::deleteTexture(PlatformGLObject texture)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     m_state.boundTextureMap.removeIf([texture] (auto& keyValue) {
         return keyValue.value.first == texture;
@@ -1921 +2235 @@
 void GraphicsContextGLOpenGL::texImage2DDirect(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLint border, GCGLenum format, GCGLenum type, const void* pixels)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     if (!m_isForWebGL2 && m_extensions)
         internalformat = m_extensions->adjustWebGL1TextureInternalFormat(internalformat, format, type);
@@ -1930 +2246 @@
 void GraphicsContextGLOpenGL::drawArraysInstanced(GCGLenum mode, GCGLint first, GCGLsizei count, GCGLsizei primcount)
 {
+    if (!makeContextCurrent())
+        return;
+
     if (m_isForWebGL2)
         gl::DrawArraysInstanced(mode, first, count, primcount);
     else
-        getExtensions().drawArraysInstanced(mode, first, count, primcount);
+        gl::DrawArraysInstancedANGLE(mode, first, count, primcount);
     checkGPUStatus();
 }
@@ -1939 +2258 @@
 void GraphicsContextGLOpenGL::drawElementsInstanced(GCGLenum mode, GCGLsizei count, GCGLenum type, GCGLintptr offset, GCGLsizei primcount)
 {
+    if (!makeContextCurrent())
+        return;
+
     if (m_isForWebGL2)
         gl::DrawElementsInstanced(mode, count, type, reinterpret_cast<void*>(offset), primcount);
     else
-        getExtensions().drawElementsInstanced(mode, count, type, offset, primcount);
+        gl::DrawElementsInstancedANGLE(mode, count, type, reinterpret_cast<void*>(offset), primcount);
     checkGPUStatus();
 }
@@ -1948 +2270 @@
 void GraphicsContextGLOpenGL::vertexAttribDivisor(GCGLuint index, GCGLuint divisor)
 {
+    if (!makeContextCurrent())
+        return;
+
     if (m_isForWebGL2)
         gl::VertexAttribDivisor(index, divisor);
     else
-        getExtensions().vertexAttribDivisor(index, divisor);
+        gl::VertexAttribDivisorANGLE(index, divisor);
 }
 
@@ -1957 +2282 @@
 {
     ASSERT(program);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_INVALID_INDEX;
+
     return gl::GetUniformBlockIndex(program, uniformBlockName.utf8().data());
 }
@@ -1974 +2301 @@
 {
     ASSERT(program);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return String();
+
     GLint maxLength = 0;
     gl::GetProgramiv(program, GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH, &maxLength);
@@ -1992 +2321 @@
 {
     ASSERT(program);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
@@ -2000 +2331 @@
 PlatformGLObject GraphicsContextGLOpenGL::createQuery()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint name = 0;
     gl::GenQueries(1, &name);
@@ -2008 +2341 @@
 void GraphicsContextGLOpenGL::beginQuery(GCGLenum target, PlatformGLObject query)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BeginQuery(target, query);
 }
@@ -2014 +2349 @@
 void GraphicsContextGLOpenGL::endQuery(GCGLenum target)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::EndQuery(target);
 }
@@ -2020 +2357 @@
 void GraphicsContextGLOpenGL::getQueryObjectuiv(GCGLuint id, GCGLenum pname, GCGLuint* params)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetQueryObjectuiv(id, pname, params);
 }
@@ -2028 +2367 @@
 PlatformGLObject GraphicsContextGLOpenGL::createTransformFeedback()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint name = 0;
     gl::GenTransformFeedbacks(1, &name);
@@ -2036 +2377 @@
 void GraphicsContextGLOpenGL::deleteTransformFeedback(PlatformGLObject transformFeedback)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DeleteTransformFeedbacks(1, &transformFeedback);
 }
@@ -2042 +2385 @@
 GCGLboolean GraphicsContextGLOpenGL::isTransformFeedback(PlatformGLObject transformFeedback)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsTransformFeedback(transformFeedback);
 }
@@ -2048 +2393 @@
 void GraphicsContextGLOpenGL::bindTransformFeedback(GCGLenum target, PlatformGLObject transformFeedback)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BindTransformFeedback(target, transformFeedback);
 }
@@ -2054 +2401 @@
 void GraphicsContextGLOpenGL::beginTransformFeedback(GCGLenum primitiveMode)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BeginTransformFeedback(primitiveMode);
 }
@@ -2060 +2409 @@
 void GraphicsContextGLOpenGL::endTransformFeedback()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::EndTransformFeedback();
 }
@@ -2066 +2417 @@
 void GraphicsContextGLOpenGL::transformFeedbackVaryings(PlatformGLObject program, const Vector<String>& varyings, GCGLenum bufferMode)
 {
+    if (!makeContextCurrent())
+        return;
+
     Vector<CString> convertedVaryings = varyings.map([](const String& varying) {
         return varying.utf8();
@@ -2072 +2426 @@
         return varying.data();
     });
-    makeContextCurrent();
+
     gl::TransformFeedbackVaryings(program, pointersToVaryings.size(), pointersToVaryings.data(), bufferMode);
 }
@@ -2078 +2432 @@
 void GraphicsContextGLOpenGL::getTransformFeedbackVarying(PlatformGLObject program, GCGLuint index, ActiveInfo& info)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     GCGLsizei bufSize = 0;
     gl::GetProgramiv(program, GraphicsContextGLOpenGL::TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH, &bufSize);
@@ -2098 +2454 @@
 void GraphicsContextGLOpenGL::bindBufferBase(GCGLenum target, GCGLuint index, PlatformGLObject buffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BindBufferBase(target, index, buffer);
 }
@@ -2132 +2490 @@
 void GraphicsContextGLOpenGL::blitFramebuffer(GCGLint srcX0, GCGLint srcY0, GCGLint srcX1, GCGLint srcY1, GCGLint dstX0, GCGLint dstY0, GCGLint dstX1, GCGLint dstY1, GCGLbitfield mask, GCGLenum filter)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
@@ -2137 +2498 @@
 void GraphicsContextGLOpenGL::framebufferTextureLayer(GCGLenum target, GCGLenum attachment, PlatformGLObject texture, GCGLint level, GCGLint layer)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
@@ -2142 +2506 @@
 void GraphicsContextGLOpenGL::invalidateFramebuffer(GCGLenum target, GCGLsizei numAttachments, const GCGLenum* attachments)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::InvalidateFramebuffer(target, numAttachments, attachments);
 }
@@ -2147 +2514 @@
 void GraphicsContextGLOpenGL::invalidateSubFramebuffer(GCGLenum target, GCGLsizei numAttachments, const GCGLenum* attachments, GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
 }
@@ -2152 +2522 @@
 void GraphicsContextGLOpenGL::readBuffer(GCGLenum src)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::ReadBuffer(src);
 }
@@ -2157 +2530 @@
 void GraphicsContextGLOpenGL::copyTexSubImage3D(GCGLenum target, GCGLint level, GCGLint xoffset, GCGLint yoffset, GCGLint zoffset, GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     auto attrs = contextAttributes();
     GCGLenum framebufferTarget = m_isForWebGL2 ? GraphicsContextGL::READ_FRAMEBUFFER : GraphicsContextGL::FRAMEBUFFER;
@@ -2172 +2547 @@
 GCGLint GraphicsContextGLOpenGL::getFragDataLocation(PlatformGLObject program, const String& name)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return -1;
+
     return gl::GetFragDataLocation(program, name.utf8().data());
 }
@@ -2178 +2555 @@
 void GraphicsContextGLOpenGL::uniform1ui(GCGLint location, GCGLuint v0)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform1ui(location, v0);
 }
@@ -2184 +2563 @@
 void GraphicsContextGLOpenGL::uniform2ui(GCGLint location, GCGLuint v0, GCGLuint v1)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform2ui(location, v0, v1);
 }
@@ -2190 +2571 @@
 void GraphicsContextGLOpenGL::uniform3ui(GCGLint location, GCGLuint v0, GCGLuint v1, GCGLuint v2)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform3ui(location, v0, v1, v2);
 }
@@ -2196 +2579 @@
 void GraphicsContextGLOpenGL::uniform4ui(GCGLint location, GCGLuint v0, GCGLuint v1, GCGLuint v2, GCGLuint v3)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform4ui(location, v0, v1, v2, v3);
 }
@@ -2202 +2587 @@
 void GraphicsContextGLOpenGL::uniform1uiv(GCGLint location, const GCGLuint* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform1uiv(location, srcLength, data + srcOffset);
 }
@@ -2208 +2595 @@
 void GraphicsContextGLOpenGL::uniform2uiv(GCGLint location, const GCGLuint* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform2uiv(location, srcLength, data + srcOffset);
 }
@@ -2214 +2603 @@
 void GraphicsContextGLOpenGL::uniform3uiv(GCGLint location, const GCGLuint* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform3uiv(location, srcLength, data + srcOffset);
 }
@@ -2220 +2611 @@
 void GraphicsContextGLOpenGL::uniform4uiv(GCGLint location, const GCGLuint* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform4uiv(location, srcLength, data + srcOffset);
 }
@@ -2226 +2619 @@
 void GraphicsContextGLOpenGL::uniformMatrix2x3fv(GCGLint location, GCGLboolean transpose, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix2x3fv(location, srcLength, transpose, data + srcOffset);
 }
@@ -2232 +2627 @@
 void GraphicsContextGLOpenGL::uniformMatrix3x2fv(GCGLint location, GCGLboolean transpose, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix3x2fv(location, srcLength, transpose, data + srcOffset);
 }
@@ -2238 +2635 @@
 void GraphicsContextGLOpenGL::uniformMatrix2x4fv(GCGLint location, GCGLboolean transpose, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix2x4fv(location, srcLength, transpose, data + srcOffset);
 }
@@ -2244 +2643 @@
 void GraphicsContextGLOpenGL::uniformMatrix4x2fv(GCGLint location, GCGLboolean transpose, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix4x2fv(location, srcLength, transpose, data + srcOffset);
 }
@@ -2250 +2651 @@
 void GraphicsContextGLOpenGL::uniformMatrix3x4fv(GCGLint location, GCGLboolean transpose, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix3x4fv(location, srcLength, transpose, data + srcOffset);
 }
@@ -2256 +2659 @@
 void GraphicsContextGLOpenGL::uniformMatrix4x3fv(GCGLint location, GCGLboolean transpose, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix4x3fv(location, srcLength, transpose, data + srcOffset);
 }
@@ -2262 +2667 @@
 void GraphicsContextGLOpenGL::vertexAttribI4i(GCGLuint index, GCGLint x, GCGLint y, GCGLint z, GCGLint w)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttribI4i(index, x, y, z, w);
 }
@@ -2268 +2675 @@
 void GraphicsContextGLOpenGL::vertexAttribI4iv(GCGLuint index, const GCGLint* values)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttribI4iv(index, values);
 }
@@ -2274 +2683 @@
 void GraphicsContextGLOpenGL::vertexAttribI4ui(GCGLuint index, GCGLuint x, GCGLuint y, GCGLuint z, GCGLuint w)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttribI4ui(index, x, y, z, w);
 }
@@ -2280 +2691 @@
 void GraphicsContextGLOpenGL::vertexAttribI4uiv(GCGLuint index, const GCGLuint* values)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::VertexAttribI4uiv(index, values);
 }
@@ -2286 +2699 @@
 void GraphicsContextGLOpenGL::drawRangeElements(GCGLenum mode, GCGLuint start, GCGLuint end, GCGLsizei count, GCGLenum type, GCGLintptr offset)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::DrawRangeElements(mode, start, end, count, type, reinterpret_cast<void*>(offset));
 }
@@ -2291 +2707 @@
 void GraphicsContextGLOpenGL::drawBuffers(GCGLsizei n, const GCGLenum* bufs)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::DrawBuffers(n, bufs);
 }
@@ -2296 +2715 @@
 void GraphicsContextGLOpenGL::clearBufferiv(GCGLenum buffer, GCGLint drawbuffer, const GCGLint* values, GCGLuint srcOffset)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::ClearBufferiv(buffer, drawbuffer, values + srcOffset);
 }
@@ -2301 +2723 @@
 void GraphicsContextGLOpenGL::clearBufferuiv(GCGLenum buffer, GCGLint drawbuffer, const GCGLuint* values, GCGLuint srcOffset)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::ClearBufferuiv(buffer, drawbuffer, values + srcOffset);
 }
@@ -2306 +2731 @@
 void GraphicsContextGLOpenGL::clearBufferfv(GCGLenum buffer, GCGLint drawbuffer, const GCGLfloat* values, GCGLuint srcOffset)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::ClearBufferfv(buffer, drawbuffer, values + srcOffset);
 }
@@ -2311 +2739 @@
 void GraphicsContextGLOpenGL::clearBufferfi(GCGLenum buffer, GCGLint drawbuffer, GCGLfloat depth, GCGLint stencil)
 {
+    if (!makeContextCurrent())
+        return;
+
     gl::ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
@@ -2316 +2747 @@
 void GraphicsContextGLOpenGL::deleteQuery(PlatformGLObject query)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DeleteQueries(1, &query);
 }
@@ -2322 +2755 @@
 GCGLboolean GraphicsContextGLOpenGL::isQuery(PlatformGLObject query)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsQuery(query);
 }
@@ -2328 +2763 @@
 PlatformGLObject GraphicsContextGLOpenGL::getQuery(GCGLenum target, GCGLenum pname)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLint value;
     gl::GetQueryiv(target, pname, &value);
@@ -2336 +2773 @@
 PlatformGLObject GraphicsContextGLOpenGL::createSampler()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint name = 0;
     gl::GenSamplers(1, &name);
@@ -2344 +2783 @@
 void GraphicsContextGLOpenGL::deleteSampler(PlatformGLObject sampler)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DeleteSamplers(1, &sampler);
 }
@@ -2350 +2791 @@
 GCGLboolean GraphicsContextGLOpenGL::isSampler(PlatformGLObject sampler)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsSampler(sampler);
 }
@@ -2356 +2799 @@
 void GraphicsContextGLOpenGL::bindSampler(GCGLuint unit, PlatformGLObject sampler)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BindSampler(unit, sampler);
 }
@@ -2362 +2807 @@
 void GraphicsContextGLOpenGL::samplerParameteri(PlatformGLObject sampler, GCGLenum pname, GCGLint param)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::SamplerParameteri(sampler, pname, param);
 }
@@ -2368 +2815 @@
 void GraphicsContextGLOpenGL::samplerParameterf(PlatformGLObject sampler, GCGLenum pname, GCGLfloat param)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::SamplerParameterf(sampler, pname, param);
 }
@@ -2374 +2823 @@
 void GraphicsContextGLOpenGL::getSamplerParameterfv(PlatformGLObject sampler, GCGLenum pname, GCGLfloat* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetSamplerParameterfv(sampler, pname, value);
 }
@@ -2380 +2831 @@
 void GraphicsContextGLOpenGL::getSamplerParameteriv(PlatformGLObject sampler, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetSamplerParameteriv(sampler, pname, value);
 }
@@ -2386 +2839 @@
 GCGLsync GraphicsContextGLOpenGL::fenceSync(GCGLenum condition, GCGLbitfield flags)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     return gl::FenceSync(condition, flags);
 }
@@ -2392 +2847 @@
 GCGLboolean GraphicsContextGLOpenGL::isSync(GCGLsync sync)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return gl::IsSync(sync);
 }
@@ -2398 +2855 @@
 void GraphicsContextGLOpenGL::deleteSync(GCGLsync sync)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::DeleteSync(sync);
 }
@@ -2404 +2863 @@
 GCGLenum GraphicsContextGLOpenGL::clientWaitSync(GCGLsync sync, GCGLbitfield flags, GCGLuint64 timeout)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_WAIT_FAILED;
+
     return gl::ClientWaitSync(sync, flags, timeout);
 }
@@ -2410 +2871 @@
 void GraphicsContextGLOpenGL::waitSync(GCGLsync sync, GCGLbitfield flags, GCGLint64 timeout)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::WaitSync(sync, flags, timeout);
 }
@@ -2416 +2879 @@
 void GraphicsContextGLOpenGL::getSynciv(GCGLsync sync, GCGLenum pname, GCGLsizei bufSize, GCGLint *value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::GetSynciv(sync, pname, bufSize, nullptr, value);
 }
@@ -2422 +2887 @@
 void GraphicsContextGLOpenGL::pauseTransformFeedback()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::PauseTransformFeedback();
 }
@@ -2428 +2895 @@
 void GraphicsContextGLOpenGL::resumeTransformFeedback()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::ResumeTransformFeedback();
 }
@@ -2434 +2903 @@
 void GraphicsContextGLOpenGL::bindBufferRange(GCGLenum target, GCGLuint index, PlatformGLObject buffer, GCGLintptr offset, GCGLsizeiptr size)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::BindBufferRange(target, index, buffer, offset, size);
 }
@@ -2441 +2912 @@
 {
     ASSERT(program);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return { };
+
     Vector<CString> utf8 = uniformNames.map([](auto& x) { return x.utf8(); });
     Vector<const char*> cstr = utf8.map([](auto& x) { return x.data(); });
@@ -2503 +2976 @@
 void GraphicsContextGLOpenGL::uniform1fv(GCGLint location, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform1fv(location, srcLength, data + srcOffset);
 }
@@ -2509 +2984 @@
 void GraphicsContextGLOpenGL::uniform2fv(GCGLint location, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform2fv(location, srcLength, data + srcOffset);
 }
@@ -2515 +2992 @@
 void GraphicsContextGLOpenGL::uniform3fv(GCGLint location, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform3fv(location, srcLength, data + srcOffset);
 }
@@ -2521 +3000 @@
 void GraphicsContextGLOpenGL::uniform4fv(GCGLint location, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform4fv(location, srcLength, data + srcOffset);
 }
@@ -2527 +3008 @@
 void GraphicsContextGLOpenGL::uniform1iv(GCGLint location, const GCGLint* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform1iv(location, srcLength, data + srcOffset);
 }
@@ -2533 +3016 @@
 void GraphicsContextGLOpenGL::uniform2iv(GCGLint location, const GCGLint* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform2iv(location, srcLength, data + srcOffset);
 }
@@ -2539 +3024 @@
 void GraphicsContextGLOpenGL::uniform3iv(GCGLint location, const GCGLint* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform3iv(location, srcLength, data + srcOffset);
 }
@@ -2545 +3032 @@
 void GraphicsContextGLOpenGL::uniform4iv(GCGLint location, const GCGLint* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::Uniform4iv(location, srcLength, data + srcOffset);
 }
@@ -2551 +3040 @@
 void GraphicsContextGLOpenGL::uniformMatrix2fv(GCGLint location, GCGLboolean transpose, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix2fv(location, srcLength, transpose, data + srcOffset);
 }
@@ -2557 +3048 @@
 void GraphicsContextGLOpenGL::uniformMatrix3fv(GCGLint location, GCGLboolean transpose, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix3fv(location, srcLength, transpose, data + srcOffset);
 }
@@ -2563 +3056 @@
 void GraphicsContextGLOpenGL::uniformMatrix4fv(GCGLint location, GCGLboolean transpose, const GCGLfloat* data, GCGLuint srcOffset, GCGLuint srcLength)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     gl::UniformMatrix4fv(location, srcLength, transpose, data + srcOffset);
 }

trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLOpenGLCocoa.mm

@@ -388 +388 @@
 {
     GraphicsContextGLOpenGLManager::sharedManager().removeContext(this);
-
-    if (m_contextObj) {
+    if (makeContextCurrent()) {
         GraphicsContextGLAttributes attrs = contextAttributes();
-        makeContextCurrent(); // TODO: check result.
         gl::DeleteTextures(1, &m_texture);
 
@@ -408 +406 @@
         if (m_preserveDrawingBufferFBO)
             gl::DeleteFramebuffers(1, &m_preserveDrawingBufferFBO);
-
-        if (m_displayBufferPbuffer) {
-            EGL_ReleaseTexImage(m_displayObj, m_displayBufferPbuffer, EGL_BACK_BUFFER);
-            EGL_DestroySurface(m_displayObj, m_displayBufferPbuffer);
-        }
+    }
+    if (m_displayBufferPbuffer)
+        EGL_DestroySurface(m_displayObj, m_displayBufferPbuffer);
+    if (m_webGLLayer) {
         auto recycledBuffer = [m_webGLLayer recycleBuffer];
         if (recycledBuffer.handle)
@@ -419 +416 @@
         if (contentsHandle)
             EGL_DestroySurface(m_displayObj, contentsHandle);
-
+    }
+    if (m_contextObj) {
         EGL_MakeCurrent(m_displayObj, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
         EGL_DestroyContext(m_displayObj, m_contextObj);
@@ -553 +551 @@
 void GraphicsContextGLOpenGL::updateCGLContext()
 {
-    if (!m_contextObj)
-        return;
-
+    if (!makeContextCurrent())
+        return;
     LOG(WebGL, "Detected a mux switch or display reconfiguration. Call CGLUpdateContext. (%p)", this);
 
-    makeContextCurrent();
     EGLDeviceEXT device = nullptr;
     EGL_QueryDisplayAttribEXT(m_displayObj, EGL_DEVICE_EXT, reinterpret_cast<EGLAttrib*>(&device));

trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGL.cpp

@@ -51 +51 @@
 void ExtensionsGLOpenGL::blitFramebuffer(long srcX0, long srcY0, long srcX1, long srcY1, long dstX0, long dstY0, long dstX1, long dstY1, unsigned long mask, unsigned long filter)
 {
+    if (!m_context->makeContextCurrent())
+        return;
+
     ::glBlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
@@ -56 +59 @@
 void ExtensionsGLOpenGL::renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height)
 {
+    if (!m_context->makeContextCurrent())
+        return;
+
     ::glRenderbufferStorageMultisampleEXT(target, samples, internalformat, width, height);
 }
@@ -61 +67 @@
 PlatformGLObject ExtensionsGLOpenGL::createVertexArrayOES()
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return 0;
+
     GLuint array = 0;
 #if PLATFORM(GTK) || PLATFORM(WIN)
@@ -77 +85 @@
         return;
 
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
 #if PLATFORM(GTK) || PLATFORM(WIN)
     if (isVertexArrayObjectSupported())
@@ -91 +101 @@
         return GL_FALSE;
 
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return GL_FALSE;
+
 #if PLATFORM(GTK) || PLATFORM(WIN)
     if (isVertexArrayObjectSupported())
@@ -103 +115 @@
 void ExtensionsGLOpenGL::bindVertexArrayOES(PlatformGLObject array)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
 #if PLATFORM(GTK) || PLATFORM(WIN)
     if (isVertexArrayObjectSupported())
@@ -197 +211 @@
 void ExtensionsGLOpenGL::drawBuffersEXT(GCGLsizei n, const GCGLenum* bufs)
 {
+    if (!m_context->makeContextCurrent())
+        return;
+
     //  FIXME: implement support for other platforms.
 #if PLATFORM(GTK)
@@ -208 +225 @@
 void ExtensionsGLOpenGL::drawArraysInstanced(GCGLenum mode, GCGLint first, GCGLsizei count, GCGLsizei primcount)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
 #if PLATFORM(GTK)
     ::glDrawArraysInstanced(mode, first, count, primcount);
@@ -221 +240 @@
 void ExtensionsGLOpenGL::drawElementsInstanced(GCGLenum mode, GCGLsizei count, GCGLenum type, long long offset, GCGLsizei primcount)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
 #if PLATFORM(GTK)
     ::glDrawElementsInstanced(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
@@ -235 +256 @@
 void ExtensionsGLOpenGL::vertexAttribDivisor(GCGLuint index, GCGLuint divisor)
 {
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
 #if PLATFORM(GTK)
     ::glVertexAttribDivisor(index, divisor);

trunk/Source/WebCore/platform/graphics/opengl/ExtensionsGLOpenGLES.cpp

@@ -86 +86 @@
 void ExtensionsGLOpenGLES::framebufferTexture2DMultisampleIMG(unsigned long target, unsigned long attachment, unsigned long textarget, unsigned texture, int level, unsigned long samples)
 {
+    if (!m_context->makeContextCurrent())
+        return;
     if (m_glFramebufferTexture2DMultisampleIMG)
         m_glFramebufferTexture2DMultisampleIMG(target, attachment, textarget, texture, level, samples);
@@ -94 +96 @@
 void ExtensionsGLOpenGLES::renderbufferStorageMultisampleIMG(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height)
 {
+    if (!m_context->makeContextCurrent())
+        return;
     if (m_glRenderbufferStorageMultisampleIMG)
         m_glRenderbufferStorageMultisampleIMG(target, samples, internalformat, width, height);
@@ -107 +111 @@
 void ExtensionsGLOpenGLES::renderbufferStorageMultisample(unsigned long target, unsigned long samples, unsigned long internalformat, unsigned long width, unsigned long height)
 {
+    if (!m_context->makeContextCurrent())
+        return;
     if (m_glRenderbufferStorageMultisampleIMG)
         renderbufferStorageMultisampleIMG(target, samples, internalformat, width, height);
@@ -130 +136 @@
 PlatformGLObject ExtensionsGLOpenGLES::createVertexArrayOES()
 {
-    m_context->makeContextCurrent();
     if (m_glGenVertexArraysOES) {
+        if (!m_context->makeContextCurrent())
+            return 0;
         GLuint array = 0;
         m_glGenVertexArraysOES(1, &array);
@@ -145 +152 @@
     if (!array)
         return;
-
-    m_context->makeContextCurrent();
-    if (m_glDeleteVertexArraysOES)
+    if (m_glDeleteVertexArraysOES) {
+        if (!m_context->makeContextCurrent())
+            return;
         m_glDeleteVertexArraysOES(1, &array);
-    else
-        m_context->synthesizeGLError(GL_INVALID_OPERATION);
+        return;
+    }
+    m_context->synthesizeGLError(GL_INVALID_OPERATION);
 }
 
@@ -157 +165 @@
     if (!array)
         return GL_FALSE;
-
-    m_context->makeContextCurrent();
-    if (m_glIsVertexArrayOES)
+    if (m_glIsVertexArrayOES) {
+        if (!m_context->makeContextCurrent())
+            return GL_FALSE;
         return m_glIsVertexArrayOES(array);
-
+    }
     m_context->synthesizeGLError(GL_INVALID_OPERATION);
     return false;
@@ -168 +176 @@
 void ExtensionsGLOpenGLES::bindVertexArrayOES(PlatformGLObject array)
 {
-    m_context->makeContextCurrent();
-    if (m_glBindVertexArrayOES)
+    if (m_glBindVertexArrayOES) {
+        if (!m_context->makeContextCurrent())
+            return;
         m_glBindVertexArrayOES(array);
-    else
+    } else
         m_context->synthesizeGLError(GL_INVALID_OPERATION);
 }
@@ -189 +198 @@
         return m_contextResetStatus;
     if (m_glGetGraphicsResetStatusEXT) {
-        m_context->makeContextCurrent();
-        int reasonForReset = m_glGetGraphicsResetStatusEXT();
+        int reasonForReset = UNKNOWN_CONTEXT_RESET_ARB;
+        if (m_context->makeContextCurrent())
+            reasonForReset = m_glGetGraphicsResetStatusEXT();
         if (reasonForReset != GL_NO_ERROR)
             m_contextResetStatus = reasonForReset;
@@ -203 +213 @@
 {
     if (m_glReadnPixelsEXT) {
-        m_context->makeContextCurrent();
+        if (!m_context->makeContextCurrent())
+            return;
+
         // FIXME: remove the two glFlush calls when the driver bug is fixed, i.e.,
         // all previous rendering calls should be done before reading pixels.
@@ -220 +232 @@
 {
     if (m_glGetnUniformfvEXT) {
-        m_context->makeContextCurrent();
+        if (!m_context->makeContextCurrent())
+            return;
+
         m_glGetnUniformfvEXT(program, location, bufSize, params);
         return;
@@ -231 +245 @@
 {
     if (m_glGetnUniformivEXT) {
-        m_context->makeContextCurrent();
+        if (!m_context->makeContextCurrent())
+            return;
+
         m_glGetnUniformivEXT(program, location, bufSize, params);
         return;
@@ -246 +262 @@
     }
 
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     m_glDrawArraysInstancedANGLE(mode, first, count, primcount);
 }
@@ -257 +275 @@
     }
 
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     m_glDrawElementsInstancedANGLE(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)), primcount);
 }
@@ -268 +288 @@
     }
 
-    m_context->makeContextCurrent();
+    if (!m_context->makeContextCurrent())
+        return;
+
     m_glVertexAttribDivisorANGLE(index, divisor);
 }

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h

@@ -109 +109 @@
 #endif
 
-    bool makeContextCurrent();
 #if PLATFORM(IOS_FAMILY)
     enum class ReleaseBehavior {
@@ -518 +517 @@
     GraphicsContextGLOpenGL(GraphicsContextGLAttributes, HostWindow*, Destination = Destination::Offscreen, GraphicsContextGLOpenGL* sharedContext = nullptr);
 
+    // Called once by all the public entry points that eventually call OpenGL.
+    // Called once by all the public entry points of ExtensionsGL that eventually call OpenGL.
+    bool makeContextCurrent() WARN_UNUSED_RETURN;
 
     // Take into account the user's requested context creation attributes,

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLBase.cpp

@@ -238 +238 @@
 void GraphicsContextGLOpenGL::renderbufferStorage(GCGLenum target, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 #if USE(OPENGL)
     switch (internalformat) {
@@ -265 +267 @@
     // whereas GLES2 return the number of vectors (each vector has 4 components).
     // Therefore, the value returned by desktop GL needs to be divided by 4.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     switch (pname) {
 #if USE(OPENGL)
@@ -311 +315 @@
     ASSERT(precision);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 
     switch (precisionType) {
@@ -404 +410 @@
 void GraphicsContextGLOpenGL::depthRange(GCGLclampf zNear, GCGLclampf zFar)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glDepthRange(zNear, zFar);
 }
@@ -410 +418 @@
 void GraphicsContextGLOpenGL::clearDepth(GCGLclampf depth)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glClearDepth(depth);
 }
@@ -429 +439 @@
     // FIXME: remove the two glFlush calls when the driver bug is fixed, i.e.,
     // all previous rendering calls should be done before reading pixels.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glFlush();
     ASSERT(m_state.boundReadFBO == m_state.boundDrawFBO);

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLCommon.cpp

@@ -201 +201 @@
         return;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 
 #if !USE(COORDINATED_GRAPHICS)
@@ -240 +242 @@
         return;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 
     bool mustRestoreFBO = false;
@@ -274 +278 @@
 void GraphicsContextGLOpenGL::reshape(int width, int height)
 {
-    if (!platformGraphicsContextGL())
-        return;
-
     if (width == m_currentWidth && height == m_currentHeight)
         return;
@@ -284 +285 @@
         return;
 
+    if (!makeContextCurrent())
+        return;
+
     markContextChanged();
 
@@ -289 +293 @@
     m_currentHeight = height;
 
-    makeContextCurrent();
     validateAttributes();
 
@@ -428 +431 @@
 void GraphicsContextGLOpenGL::activeTexture(GCGLenum texture)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     m_state.activeTextureUnit = texture;
     ::glActiveTexture(texture);
@@ -437 +442 @@
     ASSERT(program);
     ASSERT(shader);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     m_shaderProgramSymbolCountMap.remove(program);
     ::glAttachShader(program, shader);
@@ -445 +452 @@
 {
     ASSERT(program);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
 
     String mappedName = mappedSymbolName(program, SHADER_SYMBOL_TYPE_ATTRIBUTE, name);
@@ -454 +462 @@
 void GraphicsContextGLOpenGL::bindBuffer(GCGLenum target, PlatformGLObject buffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glBindBuffer(target, buffer);
 }
@@ -460 +470 @@
 void GraphicsContextGLOpenGL::bindFramebuffer(GCGLenum target, PlatformGLObject buffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     GLuint fbo;
     if (buffer)
@@ -476 +488 @@
 void GraphicsContextGLOpenGL::bindRenderbuffer(GCGLenum target, PlatformGLObject renderbuffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glBindRenderbufferEXT(target, renderbuffer);
 }
@@ -483 +497 @@
 void GraphicsContextGLOpenGL::bindTexture(GCGLenum target, PlatformGLObject texture)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     m_state.setBoundTexture(m_state.activeTextureUnit, texture, target);
     ::glBindTexture(target, texture);
@@ -490 +506 @@
 void GraphicsContextGLOpenGL::blendColor(GCGLclampf red, GCGLclampf green, GCGLclampf blue, GCGLclampf alpha)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glBlendColor(red, green, blue, alpha);
 }
@@ -496 +514 @@
 void GraphicsContextGLOpenGL::blendEquation(GCGLenum mode)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glBlendEquation(mode);
 }
@@ -502 +522 @@
 void GraphicsContextGLOpenGL::blendEquationSeparate(GCGLenum modeRGB, GCGLenum modeAlpha)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glBlendEquationSeparate(modeRGB, modeAlpha);
 }
@@ -509 +531 @@
 void GraphicsContextGLOpenGL::blendFunc(GCGLenum sfactor, GCGLenum dfactor)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glBlendFunc(sfactor, dfactor);
 }       
@@ -515 +539 @@
 void GraphicsContextGLOpenGL::blendFuncSeparate(GCGLenum srcRGB, GCGLenum dstRGB, GCGLenum srcAlpha, GCGLenum dstAlpha)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
@@ -521 +547 @@
 void GraphicsContextGLOpenGL::bufferData(GCGLenum target, GCGLsizeiptr size, GCGLenum usage)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glBufferData(target, size, 0, usage);
 }
@@ -527 +555 @@
 void GraphicsContextGLOpenGL::bufferData(GCGLenum target, GCGLsizeiptr size, const void* data, GCGLenum usage)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glBufferData(target, size, data, usage);
 }
@@ -533 +563 @@
 void GraphicsContextGLOpenGL::bufferSubData(GCGLenum target, GCGLintptr offset, GCGLsizeiptr size, const void* data)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glBufferSubData(target, offset, size, data);
 }
@@ -539 +571 @@
 GCGLenum GraphicsContextGLOpenGL::checkFramebufferStatus(GCGLenum target)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_INVALID_OPERATION;
+
     return ::glCheckFramebufferStatusEXT(target);
 }
@@ -545 +579 @@
 void GraphicsContextGLOpenGL::clearColor(GCGLclampf r, GCGLclampf g, GCGLclampf b, GCGLclampf a)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glClearColor(r, g, b, a);
 }
@@ -551 +587 @@
 void GraphicsContextGLOpenGL::clear(GCGLbitfield mask)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glClear(mask);
     checkGPUStatus();
@@ -558 +596 @@
 void GraphicsContextGLOpenGL::clearStencil(GCGLint s)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glClearStencil(s);
 }
@@ -564 +604 @@
 void GraphicsContextGLOpenGL::colorMask(GCGLboolean red, GCGLboolean green, GCGLboolean blue, GCGLboolean alpha)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glColorMask(red, green, blue, alpha);
 }
@@ -571 +613 @@
 {
     ASSERT(shader);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
 
     // Turn on name mapping. Due to the way ANGLE name hashing works, we
@@ -633 +676 @@
 {
     ASSERT(shader);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
 
     HashMap<PlatformGLObject, ShaderSourceEntry>::iterator result = m_shaderSourceMap.find(shader);
@@ -667 +711 @@
 void GraphicsContextGLOpenGL::copyTexImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLint border)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     auto attrs = contextAttributes();
 
@@ -682 +728 @@
 void GraphicsContextGLOpenGL::copyTexSubImage2D(GCGLenum target, GCGLint level, GCGLint xoffset, GCGLint yoffset, GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     auto attrs = contextAttributes();
 
@@ -697 +745 @@
 void GraphicsContextGLOpenGL::cullFace(GCGLenum mode)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glCullFace(mode);
 }
@@ -703 +753 @@
 void GraphicsContextGLOpenGL::depthFunc(GCGLenum func)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glDepthFunc(func);
 }
@@ -709 +761 @@
 void GraphicsContextGLOpenGL::depthMask(GCGLboolean flag)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glDepthMask(flag);
 }
@@ -717 +771 @@
     ASSERT(program);
     ASSERT(shader);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     m_shaderProgramSymbolCountMap.remove(program);
     ::glDetachShader(program, shader);
@@ -724 +780 @@
 void GraphicsContextGLOpenGL::disable(GCGLenum cap)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glDisable(cap);
 }
@@ -730 +788 @@
 void GraphicsContextGLOpenGL::disableVertexAttribArray(GCGLuint index)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glDisableVertexAttribArray(index);
 }
@@ -736 +796 @@
 void GraphicsContextGLOpenGL::drawArrays(GCGLenum mode, GCGLint first, GCGLsizei count)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glDrawArrays(mode, first, count);
     checkGPUStatus();
@@ -743 +805 @@
 void GraphicsContextGLOpenGL::drawElements(GCGLenum mode, GCGLsizei count, GCGLenum type, GCGLintptr offset)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glDrawElements(mode, count, type, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)));
     checkGPUStatus();
@@ -750 +814 @@
 void GraphicsContextGLOpenGL::enable(GCGLenum cap)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glEnable(cap);
 }
@@ -756 +822 @@
 void GraphicsContextGLOpenGL::enableVertexAttribArray(GCGLuint index)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glEnableVertexAttribArray(index);
 }
@@ -762 +830 @@
 void GraphicsContextGLOpenGL::finish()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glFinish();
 }
@@ -768 +838 @@
 void GraphicsContextGLOpenGL::flush()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glFlush();
 }
@@ -774 +846 @@
 void GraphicsContextGLOpenGL::framebufferRenderbuffer(GCGLenum target, GCGLenum attachment, GCGLenum renderbuffertarget, PlatformGLObject buffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, buffer);
 }
@@ -780 +854 @@
 void GraphicsContextGLOpenGL::framebufferTexture2D(GCGLenum target, GCGLenum attachment, GCGLenum textarget, PlatformGLObject texture, GCGLint level)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glFramebufferTexture2DEXT(target, attachment, textarget, texture, level);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -787 +863 @@
 void GraphicsContextGLOpenGL::frontFace(GCGLenum mode)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glFrontFace(mode);
 }
@@ -793 +871 @@
 void GraphicsContextGLOpenGL::generateMipmap(GCGLenum target)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGenerateMipmap(target);
 }
@@ -803 +883 @@
         return false;
     }
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return false;
+
     GLint maxAttributeSize = 0;
     ::glGetProgramiv(program, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &maxAttributeSize);
@@ -849 +931 @@
     }
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return false;
+
     GLint maxUniformSize = 0;
     ::glGetProgramiv(program, GL_ACTIVE_UNIFORM_MAX_LENGTH, &maxUniformSize);
@@ -895 +979 @@
         return;
     }
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetAttachedShaders(program, maxCount, count, shaders);
 }
@@ -1038 +1124 @@
         return -1;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return -1;
+
 
     String mappedName = mappedSymbolName(program, SHADER_SYMBOL_TYPE_ATTRIBUTE, name);
@@ -1050 +1138 @@
         return -1;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return -1;
+
 
     return ::glGetAttribLocation(program, name.utf8().data());
@@ -1057 +1147 @@
 bool GraphicsContextGLOpenGL::moveErrorsToSyntheticErrorList()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return false;
+
     bool movedAnError = false;
 
@@ -1084 +1176 @@
     }
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_INVALID_OPERATION;
+
     return ::glGetError();
 }
@@ -1090 +1184 @@
 String GraphicsContextGLOpenGL::getString(GCGLenum name)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return String();
+
     return String(reinterpret_cast<const char*>(::glGetString(name)));
 }
@@ -1096 +1192 @@
 void GraphicsContextGLOpenGL::hint(GCGLenum target, GCGLenum mode)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glHint(target, mode);
 }
@@ -1105 +1203 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return ::glIsBuffer(buffer);
 }
@@ -1111 +1211 @@
 GCGLboolean GraphicsContextGLOpenGL::isEnabled(GCGLenum cap)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return ::glIsEnabled(cap);
 }
@@ -1120 +1222 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return ::glIsFramebufferEXT(framebuffer);
 }
@@ -1129 +1233 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return ::glIsProgram(program);
 }
@@ -1138 +1244 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return ::glIsRenderbufferEXT(renderbuffer);
 }
@@ -1147 +1255 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return ::glIsShader(shader);
 }
@@ -1156 +1266 @@
         return GL_FALSE;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return ::glIsTexture(texture);
 }
@@ -1162 +1274 @@
 void GraphicsContextGLOpenGL::lineWidth(GCGLfloat width)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glLineWidth(width);
 }
@@ -1169 +1283 @@
 {
     ASSERT(program);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 
     GCGLsizei count = 0;
@@ -1183 +1299 @@
 void GraphicsContextGLOpenGL::pixelStorei(GCGLenum pname, GCGLint param)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glPixelStorei(pname, param);
 }
@@ -1189 +1307 @@
 void GraphicsContextGLOpenGL::polygonOffset(GCGLfloat factor, GCGLfloat units)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glPolygonOffset(factor, units);
 }
@@ -1195 +1315 @@
 void GraphicsContextGLOpenGL::sampleCoverage(GCGLclampf value, GCGLboolean invert)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glSampleCoverage(value, invert);
 }
@@ -1201 +1323 @@
 void GraphicsContextGLOpenGL::scissor(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glScissor(x, y, width, height);
 }
@@ -1209 +1333 @@
     ASSERT(shader);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 
     ShaderSourceEntry entry;
@@ -1220 +1346 @@
 void GraphicsContextGLOpenGL::stencilFunc(GCGLenum func, GCGLint ref, GCGLuint mask)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glStencilFunc(func, ref, mask);
 }
@@ -1226 +1354 @@
 void GraphicsContextGLOpenGL::stencilFuncSeparate(GCGLenum face, GCGLenum func, GCGLint ref, GCGLuint mask)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glStencilFuncSeparate(face, func, ref, mask);
 }
@@ -1232 +1362 @@
 void GraphicsContextGLOpenGL::stencilMask(GCGLuint mask)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glStencilMask(mask);
 }
@@ -1238 +1370 @@
 void GraphicsContextGLOpenGL::stencilMaskSeparate(GCGLenum face, GCGLuint mask)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glStencilMaskSeparate(face, mask);
 }
@@ -1244 +1378 @@
 void GraphicsContextGLOpenGL::stencilOp(GCGLenum fail, GCGLenum zfail, GCGLenum zpass)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glStencilOp(fail, zfail, zpass);
 }
@@ -1250 +1386 @@
 void GraphicsContextGLOpenGL::stencilOpSeparate(GCGLenum face, GCGLenum fail, GCGLenum zfail, GCGLenum zpass)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glStencilOpSeparate(face, fail, zfail, zpass);
 }
@@ -1256 +1394 @@
 void GraphicsContextGLOpenGL::texParameterf(GCGLenum target, GCGLenum pname, GCGLfloat value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glTexParameterf(target, pname, value);
 }
@@ -1262 +1402 @@
 void GraphicsContextGLOpenGL::texParameteri(GCGLenum target, GCGLenum pname, GCGLint value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glTexParameteri(target, pname, value);
 }
@@ -1268 +1410 @@
 void GraphicsContextGLOpenGL::uniform1f(GCGLint location, GCGLfloat v0)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform1f(location, v0);
 }
@@ -1274 +1418 @@
 void GraphicsContextGLOpenGL::uniform1fv(GCGLint location, GCGLsizei size, const GCGLfloat* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform1fv(location, size, array);
 }
@@ -1280 +1426 @@
 void GraphicsContextGLOpenGL::uniform2f(GCGLint location, GCGLfloat v0, GCGLfloat v1)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform2f(location, v0, v1);
 }
@@ -1287 +1435 @@
 {
     // FIXME: length needs to be a multiple of 2.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform2fv(location, size, array);
 }
@@ -1293 +1443 @@
 void GraphicsContextGLOpenGL::uniform3f(GCGLint location, GCGLfloat v0, GCGLfloat v1, GCGLfloat v2)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform3f(location, v0, v1, v2);
 }
@@ -1300 +1452 @@
 {
     // FIXME: length needs to be a multiple of 3.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform3fv(location, size, array);
 }
@@ -1306 +1460 @@
 void GraphicsContextGLOpenGL::uniform4f(GCGLint location, GCGLfloat v0, GCGLfloat v1, GCGLfloat v2, GCGLfloat v3)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform4f(location, v0, v1, v2, v3);
 }
@@ -1313 +1469 @@
 {
     // FIXME: length needs to be a multiple of 4.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform4fv(location, size, array);
 }
@@ -1319 +1477 @@
 void GraphicsContextGLOpenGL::uniform1i(GCGLint location, GCGLint v0)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform1i(location, v0);
 }
@@ -1325 +1485 @@
 void GraphicsContextGLOpenGL::uniform1iv(GCGLint location, GCGLsizei size, const GCGLint* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform1iv(location, size, array);
 }
@@ -1331 +1493 @@
 void GraphicsContextGLOpenGL::uniform2i(GCGLint location, GCGLint v0, GCGLint v1)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform2i(location, v0, v1);
 }
@@ -1338 +1502 @@
 {
     // FIXME: length needs to be a multiple of 2.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform2iv(location, size, array);
 }
@@ -1344 +1510 @@
 void GraphicsContextGLOpenGL::uniform3i(GCGLint location, GCGLint v0, GCGLint v1, GCGLint v2)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform3i(location, v0, v1, v2);
 }
@@ -1351 +1519 @@
 {
     // FIXME: length needs to be a multiple of 3.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform3iv(location, size, array);
 }
@@ -1357 +1527 @@
 void GraphicsContextGLOpenGL::uniform4i(GCGLint location, GCGLint v0, GCGLint v1, GCGLint v2, GCGLint v3)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform4i(location, v0, v1, v2, v3);
 }
@@ -1364 +1536 @@
 {
     // FIXME: length needs to be a multiple of 4.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniform4iv(location, size, array);
 }
@@ -1371 +1545 @@
 {
     // FIXME: length needs to be a multiple of 4.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniformMatrix2fv(location, size, transpose, array);
 }
@@ -1378 +1554 @@
 {
     // FIXME: length needs to be a multiple of 9.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniformMatrix3fv(location, size, transpose, array);
 }
@@ -1385 +1563 @@
 {
     // FIXME: length needs to be a multiple of 16.
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUniformMatrix4fv(location, size, transpose, array);
 }
@@ -1391 +1571 @@
 void GraphicsContextGLOpenGL::useProgram(PlatformGLObject program)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glUseProgram(program);
 }
@@ -1399 +1581 @@
     ASSERT(program);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glValidateProgram(program);
 }
@@ -1405 +1589 @@
 void GraphicsContextGLOpenGL::vertexAttrib1f(GCGLuint index, GCGLfloat v0)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glVertexAttrib1f(index, v0);
 }
@@ -1411 +1597 @@
 void GraphicsContextGLOpenGL::vertexAttrib1fv(GCGLuint index, const GCGLfloat* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glVertexAttrib1fv(index, array);
 }
@@ -1417 +1605 @@
 void GraphicsContextGLOpenGL::vertexAttrib2f(GCGLuint index, GCGLfloat v0, GCGLfloat v1)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glVertexAttrib2f(index, v0, v1);
 }
@@ -1423 +1613 @@
 void GraphicsContextGLOpenGL::vertexAttrib2fv(GCGLuint index, const GCGLfloat* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glVertexAttrib2fv(index, array);
 }
@@ -1429 +1621 @@
 void GraphicsContextGLOpenGL::vertexAttrib3f(GCGLuint index, GCGLfloat v0, GCGLfloat v1, GCGLfloat v2)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glVertexAttrib3f(index, v0, v1, v2);
 }
@@ -1435 +1629 @@
 void GraphicsContextGLOpenGL::vertexAttrib3fv(GCGLuint index, const GCGLfloat* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glVertexAttrib3fv(index, array);
 }
@@ -1441 +1637 @@
 void GraphicsContextGLOpenGL::vertexAttrib4f(GCGLuint index, GCGLfloat v0, GCGLfloat v1, GCGLfloat v2, GCGLfloat v3)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glVertexAttrib4f(index, v0, v1, v2, v3);
 }
@@ -1447 +1645 @@
 void GraphicsContextGLOpenGL::vertexAttrib4fv(GCGLuint index, const GCGLfloat* array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glVertexAttrib4fv(index, array);
 }
@@ -1453 +1653 @@
 void GraphicsContextGLOpenGL::vertexAttribPointer(GCGLuint index, GCGLint size, GCGLenum type, GCGLboolean normalized, GCGLsizei stride, GCGLintptr offset)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glVertexAttribPointer(index, size, type, normalized, stride, reinterpret_cast<GLvoid*>(static_cast<intptr_t>(offset)));
 }
@@ -1459 +1661 @@
 void GraphicsContextGLOpenGL::viewport(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glViewport(x, y, width, height);
 }
@@ -1465 +1669 @@
 PlatformGLObject GraphicsContextGLOpenGL::createVertexArray()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint array = 0;
 #if (!USE(OPENGL_ES) && (PLATFORM(GTK) || PLATFORM(WIN))) || PLATFORM(COCOA)
@@ -1478 +1684 @@
         return;
     
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 #if (!USE(OPENGL_ES) && (PLATFORM(GTK) || PLATFORM(WIN))) || PLATFORM(COCOA)
     ::glDeleteVertexArrays(1, &array);
@@ -1489 +1697 @@
         return GL_FALSE;
     
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
 #if (!USE(OPENGL_ES) && (PLATFORM(GTK) || PLATFORM(WIN))) || PLATFORM(COCOA)
     return ::glIsVertexArray(array);
@@ -1498 +1708 @@
 void GraphicsContextGLOpenGL::bindVertexArray(PlatformGLObject array)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 #if (!USE(OPENGL_ES) && (PLATFORM(GTK) || PLATFORM(WIN))) || PLATFORM(COCOA)
     ::glBindVertexArray(array);
@@ -1508 +1720 @@
 void GraphicsContextGLOpenGL::getBooleanv(GCGLenum pname, GCGLboolean* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetBooleanv(pname, value);
 }
@@ -1514 +1728 @@
 void GraphicsContextGLOpenGL::getBufferParameteriv(GCGLenum target, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetBufferParameteriv(target, pname, value);
 }
@@ -1520 +1736 @@
 void GraphicsContextGLOpenGL::getFloatv(GCGLenum pname, GCGLfloat* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetFloatv(pname, value);
 }
@@ -1528 +1746 @@
     UNUSED_PARAM(pname);
     UNUSED_PARAM(index);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     *value = 0;
     // FIXME 141178: Before enabling this we must first switch over to using gl3.h and creating and initialing the WebGL2 context using OpenGL ES 3.0.
@@ -1537 +1757 @@
 {
     UNUSED_PARAM(pname);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     *value = 0;
     // FIXME 141178: Before enabling this we must first switch over to using gl3.h and creating and initialing the WebGL2 context using OpenGL ES 3.0.
@@ -1547 +1769 @@
     UNUSED_PARAM(pname);
     UNUSED_PARAM(index);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     *value = 0;
     // FIXME 141178: Before enabling this we must first switch over to using gl3.h and creating and initialing the WebGL2 context using OpenGL ES 3.0.
@@ -1555 +1779 @@
 void GraphicsContextGLOpenGL::getFramebufferAttachmentParameteriv(GCGLenum target, GCGLenum attachment, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     if (attachment == DEPTH_STENCIL_ATTACHMENT)
         attachment = DEPTH_ATTACHMENT; // Or STENCIL_ATTACHMENT, either works.
@@ -1563 +1789 @@
 void GraphicsContextGLOpenGL::getProgramiv(PlatformGLObject program, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetProgramiv(program, pname, value);
 }
@@ -1573 +1801 @@
         return;
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     const auto& result = m_shaderProgramSymbolCountMap.find(program);
     if (result != m_shaderProgramSymbolCountMap.end()) {
@@ -1651 +1881 @@
     ASSERT(program);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return String();
+
     GLint length = 0;
     ::glGetProgramiv(program, GL_INFO_LOG_LENGTH, &length);
@@ -1670 +1902 @@
 void GraphicsContextGLOpenGL::getRenderbufferParameteriv(GCGLenum target, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetRenderbufferParameterivEXT(target, pname, value);
 }
@@ -1678 +1912 @@
     ASSERT(shader);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 
     const auto& result = m_shaderSourceMap.find(shader);
@@ -1713 +1949 @@
     ASSERT(shader);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return String();
 
     const auto& result = m_shaderSourceMap.find(shader);
@@ -1740 +1977 @@
     ASSERT(shader);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return String();
 
     const auto& result = m_shaderSourceMap.find(shader);
@@ -1751 +1989 @@
 void GraphicsContextGLOpenGL::getTexParameterfv(GCGLenum target, GCGLenum pname, GCGLfloat* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetTexParameterfv(target, pname, value);
 }
@@ -1757 +1997 @@
 void GraphicsContextGLOpenGL::getTexParameteriv(GCGLenum target, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetTexParameteriv(target, pname, value);
 }
@@ -1763 +2005 @@
 void GraphicsContextGLOpenGL::getUniformfv(PlatformGLObject program, GCGLint location, GCGLfloat* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetUniformfv(program, location, value);
 }
@@ -1769 +2013 @@
 void GraphicsContextGLOpenGL::getUniformiv(PlatformGLObject program, GCGLint location, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetUniformiv(program, location, value);
 }
@@ -1784 +2030 @@
     ASSERT(program);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return -1;
 
     String mappedName = mappedSymbolName(program, SHADER_SYMBOL_TYPE_UNIFORM, name);
@@ -1793 +2040 @@
 void GraphicsContextGLOpenGL::getVertexAttribfv(GCGLuint index, GCGLenum pname, GCGLfloat* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetVertexAttribfv(index, pname, value);
 }
@@ -1799 +2048 @@
 void GraphicsContextGLOpenGL::getVertexAttribiv(GCGLuint index, GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetVertexAttribiv(index, pname, value);
 }
@@ -1805 +2056 @@
 GCGLsizeiptr GraphicsContextGLOpenGL::getVertexAttribOffset(GCGLuint index, GCGLenum pname)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
 
     GLvoid* pointer = 0;
@@ -1814 +2066 @@
 void GraphicsContextGLOpenGL::texSubImage2D(GCGLenum target, GCGLint level, GCGLint xoff, GCGLint yoff, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, const void* pixels)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
 
 #if !USE(OPENGL_ES)
@@ -1845 +2098 @@
 void GraphicsContextGLOpenGL::compressedTexImage2D(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLint border, GCGLsizei imageSize, const void* data)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -1852 +2107 @@
 void GraphicsContextGLOpenGL::compressedTexSubImage2D(GCGLenum target, GCGLint level, GCGLint xoffset, GCGLint yoffset, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLsizei imageSize, const void* data)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -1859 +2116 @@
 PlatformGLObject GraphicsContextGLOpenGL::createBuffer()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint o = 0;
     glGenBuffers(1, &o);
@@ -1867 +2126 @@
 PlatformGLObject GraphicsContextGLOpenGL::createFramebuffer()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint o = 0;
     glGenFramebuffersEXT(1, &o);
@@ -1875 +2136 @@
 PlatformGLObject GraphicsContextGLOpenGL::createProgram()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     return glCreateProgram();
 }
@@ -1881 +2144 @@
 PlatformGLObject GraphicsContextGLOpenGL::createRenderbuffer()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint o = 0;
     glGenRenderbuffersEXT(1, &o);
@@ -1889 +2154 @@
 PlatformGLObject GraphicsContextGLOpenGL::createShader(GCGLenum type)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     return glCreateShader((type == FRAGMENT_SHADER) ? GL_FRAGMENT_SHADER : GL_VERTEX_SHADER);
 }
@@ -1895 +2162 @@
 PlatformGLObject GraphicsContextGLOpenGL::createTexture()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return 0;
+
     GLuint o = 0;
     glGenTextures(1, &o);
@@ -1904 +2173 @@
 void GraphicsContextGLOpenGL::deleteBuffer(PlatformGLObject buffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     glDeleteBuffers(1, &buffer);
 }
@@ -1910 +2181 @@
 void GraphicsContextGLOpenGL::deleteFramebuffer(PlatformGLObject framebuffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ASSERT(m_state.boundReadFBO == m_state.boundDrawFBO);
     if (framebuffer == m_state.boundDrawFBO) {
@@ -1922 +2195 @@
 void GraphicsContextGLOpenGL::deleteProgram(PlatformGLObject program)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     m_shaderProgramSymbolCountMap.remove(program);
     glDeleteProgram(program);
@@ -1929 +2204 @@
 void GraphicsContextGLOpenGL::deleteRenderbuffer(PlatformGLObject renderbuffer)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     glDeleteRenderbuffersEXT(1, &renderbuffer);
 }
@@ -1935 +2212 @@
 void GraphicsContextGLOpenGL::deleteShader(PlatformGLObject shader)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     glDeleteShader(shader);
 }
@@ -1941 +2220 @@
 void GraphicsContextGLOpenGL::deleteTexture(PlatformGLObject texture)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     m_state.boundTextureMap.removeIf([texture] (auto& keyValue) {
         return keyValue.value.first == texture;
@@ -1997 +2278 @@
 void GraphicsContextGLOpenGL::texImage2DDirect(GCGLenum target, GCGLint level, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLint border, GCGLenum format, GCGLenum type, const void* pixels)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glTexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -2022 +2305 @@
 void GraphicsContextGLOpenGL::primitiveRestartIndex(GCGLuint index)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glPrimitiveRestartIndex(index);
 }
@@ -2048 +2333 @@
 void GraphicsContextGLOpenGL::copyBufferSubData(GCGLenum readTarget, GCGLenum writeTarget, GCGLintptr readOffset, GCGLintptr writeOffset, GCGLsizeiptr size)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glCopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
@@ -2069 +2356 @@
 void* GraphicsContextGLOpenGL::mapBufferRange(GCGLenum target, GCGLintptr offset, GCGLsizeiptr length, GCGLbitfield access)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return nullptr;
+
     return ::glMapBufferRange(target, offset, length, access);
 }
@@ -2075 +2364 @@
 GCGLboolean GraphicsContextGLOpenGL::unmapBuffer(GCGLenum target)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return GL_FALSE;
+
     return ::glUnmapBuffer(target);
 }
@@ -2140 +2431 @@
 {
 #if USE(OPENGL_ES)
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetInternalformativ(target, internalformat, pname, bufSize, params);
 #else
@@ -2153 +2446 @@
 void GraphicsContextGLOpenGL::renderbufferStorageMultisample(GCGLenum target, GCGLsizei samples, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glRenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
@@ -2159 +2454 @@
 void GraphicsContextGLOpenGL::texStorage2D(GCGLenum target, GCGLsizei levels, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glTexStorage2D(target, levels, internalformat, width, height);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -2166 +2463 @@
 void GraphicsContextGLOpenGL::texStorage3D(GCGLenum target, GCGLsizei levels, GCGLenum internalformat, GCGLsizei width, GCGLsizei height, GCGLsizei depth)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glTexStorage3D(target, levels, internalformat, width, height, depth);
     m_state.textureSeedCount.add(m_state.currentBoundTexture());
@@ -2631 +2930 @@
 {
     ASSERT(program);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
 
     ::glGetActiveUniformsiv(program, uniformIndices.size(), uniformIndices.data(), pname, params.data());

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGLES.cpp

@@ -43 +43 @@
 void GraphicsContextGLOpenGL::readPixels(GCGLint x, GCGLint y, GCGLsizei width, GCGLsizei height, GCGLenum format, GCGLenum type, void* data)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
 
     auto attributes = contextAttributes();
@@ -189 +191 @@
 void GraphicsContextGLOpenGL::renderbufferStorage(GCGLenum target, GCGLenum internalformat, GCGLsizei width, GCGLsizei height)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glRenderbufferStorage(target, internalformat, width, height);
 }
@@ -195 +199 @@
 void GraphicsContextGLOpenGL::getIntegerv(GCGLenum pname, GCGLint* value)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetIntegerv(pname, value);
 }
@@ -204 +210 @@
     ASSERT(precision);
 
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glGetShaderPrecisionFormat(shaderType, precisionType, range, precision);
 }
@@ -233 +241 @@
 void GraphicsContextGLOpenGL::depthRange(GCGLclampf zNear, GCGLclampf zFar)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glDepthRangef(zNear, zFar);
 }
@@ -239 +249 @@
 void GraphicsContextGLOpenGL::clearDepth(GCGLclampf depth)
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glClearDepthf(depth);
 }
@@ -279 +291 @@
 {
     ASSERT_UNUSED(sharedContext, !sharedContext);
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     
     validateAttributes();
@@ -344 +358 @@
 GraphicsContextGLOpenGL::~GraphicsContextGLOpenGL()
 {
-    makeContextCurrent();
+    if (!makeContextCurrent())
+        return;
+
     ::glDeleteTextures(1, &m_texture);
 

trunk/Source/WebCore/platform/graphics/texmap/GraphicsContextGLTextureMapper.cpp

@@ -140 +140 @@
     m_texmapLayer = WTF::makeUnique<TextureMapperGCGLPlatformLayer>(*this, destination);
 #endif
-    makeContextCurrent();
+    bool success = makeContextCurrent();
+    ASSERT_UNUSED(success, success);
 
     validateAttributes();
@@ -214 +215 @@
 #endif
 
-    makeContextCurrent();
+    bool success = makeContextCurrent();
+    ASSERT_UNUSED(success, success);
 
     validateAttributes();
@@ -334 +336 @@
 GraphicsContextGLOpenGL::~GraphicsContextGLOpenGL()
 {
-    makeContextCurrent();
+    bool success = makeContextCurrent();
+    ASSERT_UNUSED(success, success);
     if (m_texture)
         gl::DeleteTextures(1, &m_texture);
@@ -378 +381 @@
 GraphicsContextGLOpenGL::~GraphicsContextGLOpenGL()
 {
-    makeContextCurrent();
+    bool success = makeContextCurrent();
+    ASSERT_UNUSED(success, success);
     if (m_texture)
         ::glDeleteTextures(1, &m_texture);