<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[208740] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208740">208740</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-11-15 11:42:04 -0800 (Tue, 15 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebGL] Migrate construction functions from pointers to references
https://bugs.webkit.org/show_bug.cgi?id=164749
Reviewed by Zalan Bujtas.
Mechanical find/replace.
No new tests because there is no behavior change.
* html/canvas/ANGLEInstancedArrays.cpp:
(WebCore::ANGLEInstancedArrays::ANGLEInstancedArrays):
(WebCore::ANGLEInstancedArrays::supported):
(WebCore::ANGLEInstancedArrays::drawArraysInstancedANGLE):
(WebCore::ANGLEInstancedArrays::drawElementsInstancedANGLE):
(WebCore::ANGLEInstancedArrays::vertexAttribDivisorANGLE):
* html/canvas/ANGLEInstancedArrays.h:
* html/canvas/EXTBlendMinMax.cpp:
(WebCore::EXTBlendMinMax::EXTBlendMinMax):
* html/canvas/EXTBlendMinMax.h:
* html/canvas/EXTFragDepth.cpp:
(WebCore::EXTFragDepth::EXTFragDepth):
* html/canvas/EXTFragDepth.h:
* html/canvas/EXTShaderTextureLOD.cpp:
(WebCore::EXTShaderTextureLOD::EXTShaderTextureLOD):
* html/canvas/EXTShaderTextureLOD.h:
* html/canvas/EXTTextureFilterAnisotropic.cpp:
(WebCore::EXTTextureFilterAnisotropic::EXTTextureFilterAnisotropic):
* html/canvas/EXTTextureFilterAnisotropic.h:
* html/canvas/EXTsRGB.cpp:
(WebCore::EXTsRGB::EXTsRGB):
* html/canvas/EXTsRGB.h:
* html/canvas/OESElementIndexUint.cpp:
(WebCore::OESElementIndexUint::OESElementIndexUint):
* html/canvas/OESElementIndexUint.h:
* html/canvas/OESStandardDerivatives.cpp:
(WebCore::OESStandardDerivatives::OESStandardDerivatives):
* html/canvas/OESStandardDerivatives.h:
* html/canvas/OESTextureFloat.cpp:
(WebCore::OESTextureFloat::OESTextureFloat):
* html/canvas/OESTextureFloat.h:
* html/canvas/OESTextureFloatLinear.cpp:
(WebCore::OESTextureFloatLinear::OESTextureFloatLinear):
* html/canvas/OESTextureFloatLinear.h:
* html/canvas/OESTextureHalfFloat.cpp:
(WebCore::OESTextureHalfFloat::OESTextureHalfFloat):
* html/canvas/OESTextureHalfFloat.h:
* html/canvas/OESTextureHalfFloatLinear.cpp:
(WebCore::OESTextureHalfFloatLinear::OESTextureHalfFloatLinear):
* html/canvas/OESTextureHalfFloatLinear.h:
* html/canvas/OESVertexArrayObject.cpp:
(WebCore::OESVertexArrayObject::OESVertexArrayObject):
(WebCore::OESVertexArrayObject::createVertexArrayOES):
(WebCore::OESVertexArrayObject::deleteVertexArrayOES):
(WebCore::OESVertexArrayObject::isVertexArrayOES):
(WebCore::OESVertexArrayObject::bindVertexArrayOES):
* html/canvas/WebGL2RenderingContext.cpp:
(WebCore::WebGL2RenderingContext::initializeVertexArrayObjects):
(WebCore::WebGL2RenderingContext::initializeShaderExtensions):
(WebCore::WebGL2RenderingContext::drawBuffers):
(WebCore::WebGL2RenderingContext::createVertexArray):
(WebCore::WebGL2RenderingContext::isVertexArray):
(WebCore::WebGL2RenderingContext::bindVertexArray):
(WebCore::WebGL2RenderingContext::getExtension):
(WebCore::WebGL2RenderingContext::getSupportedExtensions):
* html/canvas/WebGLBuffer.cpp:
(WebCore::WebGLBuffer::create):
(WebCore::WebGLBuffer::WebGLBuffer):
* html/canvas/WebGLBuffer.h:
* html/canvas/WebGLCompressedTextureATC.cpp:
(WebCore::WebGLCompressedTextureATC::WebGLCompressedTextureATC):
(WebCore::WebGLCompressedTextureATC::supported):
* html/canvas/WebGLCompressedTextureATC.h:
* html/canvas/WebGLCompressedTexturePVRTC.cpp:
(WebCore::WebGLCompressedTexturePVRTC::WebGLCompressedTexturePVRTC):
(WebCore::WebGLCompressedTexturePVRTC::supported):
* html/canvas/WebGLCompressedTexturePVRTC.h:
* html/canvas/WebGLCompressedTextureS3TC.cpp:
(WebCore::WebGLCompressedTextureS3TC::WebGLCompressedTextureS3TC):
(WebCore::WebGLCompressedTextureS3TC::supported):
* html/canvas/WebGLCompressedTextureS3TC.h:
* html/canvas/WebGLContextObject.cpp:
(WebCore::WebGLContextObject::WebGLContextObject):
* html/canvas/WebGLContextObject.h:
* html/canvas/WebGLDebugRendererInfo.cpp:
(WebCore::WebGLDebugRendererInfo::WebGLDebugRendererInfo):
* html/canvas/WebGLDebugRendererInfo.h:
* html/canvas/WebGLDebugShaders.cpp:
(WebCore::WebGLDebugShaders::WebGLDebugShaders):
(WebCore::WebGLDebugShaders::getTranslatedShaderSource):
* html/canvas/WebGLDebugShaders.h:
* html/canvas/WebGLDepthTexture.cpp:
(WebCore::WebGLDepthTexture::WebGLDepthTexture):
(WebCore::WebGLDepthTexture::supported):
* html/canvas/WebGLDepthTexture.h:
* html/canvas/WebGLDrawBuffers.cpp:
(WebCore::WebGLDrawBuffers::WebGLDrawBuffers):
(WebCore::WebGLDrawBuffers::supported):
(WebCore::WebGLDrawBuffers::drawBuffersWEBGL):
(WebCore::WebGLDrawBuffers::satisfiesWebGLRequirements):
* html/canvas/WebGLDrawBuffers.h:
* html/canvas/WebGLExtension.cpp:
(WebCore::WebGLExtension::WebGLExtension):
* html/canvas/WebGLExtension.h:
(WebCore::WebGLExtension::ref):
(WebCore::WebGLExtension::deref):
(WebCore::WebGLExtension::context):
* html/canvas/WebGLFramebuffer.cpp:
(WebCore::WebGLFramebuffer::create):
(WebCore::WebGLFramebuffer::WebGLFramebuffer):
(WebCore::WebGLFramebuffer::drawBuffersIfNecessary):
* html/canvas/WebGLFramebuffer.h:
* html/canvas/WebGLLoseContext.cpp:
(WebCore::WebGLLoseContext::WebGLLoseContext):
(WebCore::WebGLLoseContext::loseContext):
(WebCore::WebGLLoseContext::restoreContext):
* html/canvas/WebGLLoseContext.h:
* html/canvas/WebGLObject.cpp:
(WebCore::WebGLObject::WebGLObject):
* html/canvas/WebGLObject.h:
* html/canvas/WebGLProgram.cpp:
(WebCore::WebGLProgram::create):
(WebCore::WebGLProgram::WebGLProgram):
* html/canvas/WebGLProgram.h:
* html/canvas/WebGLQuery.cpp:
(WebCore::WebGLQuery::create):
(WebCore::WebGLQuery::WebGLQuery):
* html/canvas/WebGLQuery.h:
* html/canvas/WebGLRenderbuffer.cpp:
(WebCore::WebGLRenderbuffer::create):
(WebCore::WebGLRenderbuffer::WebGLRenderbuffer):
* html/canvas/WebGLRenderbuffer.h:
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::initializeVertexArrayObjects):
(WebCore::WebGLRenderingContext::getExtension):
(WebCore::WebGLRenderingContext::getSupportedExtensions):
* html/canvas/WebGLRenderingContextBase.cpp:
(WebCore::WebGLRenderingContextBase::create):
(WebCore::WebGLRenderingContextBase::setupFlags):
(WebCore::WebGLRenderingContextBase::checkObjectToBeBound):
(WebCore::WebGLRenderingContextBase::createBuffer):
(WebCore::WebGLRenderingContextBase::createFramebuffer):
(WebCore::WebGLRenderingContextBase::createTexture):
(WebCore::WebGLRenderingContextBase::createProgram):
(WebCore::WebGLRenderingContextBase::createRenderbuffer):
(WebCore::WebGLRenderingContextBase::createShader):
(WebCore::WebGLRenderingContextBase::deleteObject):
(WebCore::WebGLRenderingContextBase::validateWebGLObject):
(WebCore::WebGLRenderingContextBase::framebufferRenderbuffer):
(WebCore::WebGLRenderingContextBase::framebufferTexture2D):
(WebCore::WebGLRenderingContextBase::getUniform):
(WebCore::WebGLRenderingContextBase::readPixels):
(WebCore::WebGLRenderingContextBase::loseContextImpl):
(WebCore::WebGLRenderingContextBase::maybeRestoreContext):
(WebCore::WebGLRenderingContextBase::supportsDrawBuffers):
* html/canvas/WebGLSampler.cpp:
(WebCore::WebGLSampler::create):
(WebCore::WebGLSampler::WebGLSampler):
* html/canvas/WebGLSampler.h:
* html/canvas/WebGLShader.cpp:
(WebCore::WebGLShader::create):
(WebCore::WebGLShader::WebGLShader):
* html/canvas/WebGLShader.h:
* html/canvas/WebGLSharedObject.cpp:
(WebCore::WebGLSharedObject::WebGLSharedObject):
* html/canvas/WebGLSharedObject.h:
* html/canvas/WebGLSync.cpp:
(WebCore::WebGLSync::create):
(WebCore::WebGLSync::WebGLSync):
* html/canvas/WebGLSync.h:
* html/canvas/WebGLTexture.cpp:
(WebCore::WebGLTexture::create):
(WebCore::WebGLTexture::WebGLTexture):
* html/canvas/WebGLTexture.h:
* html/canvas/WebGLTransformFeedback.cpp:
(WebCore::WebGLTransformFeedback::create):
(WebCore::WebGLTransformFeedback::WebGLTransformFeedback):
* html/canvas/WebGLTransformFeedback.h:
* html/canvas/WebGLVertexArrayObject.cpp:
(WebCore::WebGLVertexArrayObject::create):
(WebCore::WebGLVertexArrayObject::WebGLVertexArrayObject):
* html/canvas/WebGLVertexArrayObject.h:
* html/canvas/WebGLVertexArrayObjectBase.cpp:
(WebCore::WebGLVertexArrayObjectBase::WebGLVertexArrayObjectBase):
* html/canvas/WebGLVertexArrayObjectBase.h:
* html/canvas/WebGLVertexArrayObjectOES.cpp:
(WebCore::WebGLVertexArrayObjectOES::create):
(WebCore::WebGLVertexArrayObjectOES::WebGLVertexArrayObjectOES):
(WebCore::WebGLVertexArrayObjectOES::deleteObjectImpl):
* html/canvas/WebGLVertexArrayObjectOES.h:
* platform/graphics/GraphicsContext3D.h:
* platform/graphics/gpu/Texture.cpp:
(WebCore::convertFormat):
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
(WebCore::GraphicsContext3D::readPixelsAndConvertToBGRAIfNecessary):
(WebCore::GraphicsContext3D::reshapeFBOs):
(WebCore::GraphicsContext3D::getIntegerv):
(WebCore::GraphicsContext3D::getExtensions):
* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::validateDepthStencil):
(WebCore::GraphicsContext3D::drawArraysInstanced):
(WebCore::GraphicsContext3D::drawElementsInstanced):
(WebCore::GraphicsContext3D::vertexAttribDivisor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasANGLEInstancedArrayscpp">trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasANGLEInstancedArraysh">trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTBlendMinMaxcpp">trunk/Source/WebCore/html/canvas/EXTBlendMinMax.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTBlendMinMaxh">trunk/Source/WebCore/html/canvas/EXTBlendMinMax.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTFragDepthcpp">trunk/Source/WebCore/html/canvas/EXTFragDepth.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTFragDepthh">trunk/Source/WebCore/html/canvas/EXTFragDepth.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTShaderTextureLODcpp">trunk/Source/WebCore/html/canvas/EXTShaderTextureLOD.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTShaderTextureLODh">trunk/Source/WebCore/html/canvas/EXTShaderTextureLOD.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTTextureFilterAnisotropiccpp">trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTTextureFilterAnisotropich">trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTsRGBcpp">trunk/Source/WebCore/html/canvas/EXTsRGB.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasEXTsRGBh">trunk/Source/WebCore/html/canvas/EXTsRGB.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESElementIndexUintcpp">trunk/Source/WebCore/html/canvas/OESElementIndexUint.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESElementIndexUinth">trunk/Source/WebCore/html/canvas/OESElementIndexUint.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESStandardDerivativescpp">trunk/Source/WebCore/html/canvas/OESStandardDerivatives.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESStandardDerivativesh">trunk/Source/WebCore/html/canvas/OESStandardDerivatives.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureFloatcpp">trunk/Source/WebCore/html/canvas/OESTextureFloat.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureFloath">trunk/Source/WebCore/html/canvas/OESTextureFloat.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureFloatLinearcpp">trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureFloatLinearh">trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureHalfFloatcpp">trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureHalfFloath">trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureHalfFloatLinearcpp">trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESTextureHalfFloatLinearh">trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasOESVertexArrayObjectcpp">trunk/Source/WebCore/html/canvas/OESVertexArrayObject.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGL2RenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLBuffercpp">trunk/Source/WebCore/html/canvas/WebGLBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLBufferh">trunk/Source/WebCore/html/canvas/WebGLBuffer.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLCompressedTextureATCcpp">trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLCompressedTextureATCh">trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLCompressedTexturePVRTCcpp">trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLCompressedTexturePVRTCh">trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLCompressedTextureS3TCcpp">trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLCompressedTextureS3TCh">trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLContextObjectcpp">trunk/Source/WebCore/html/canvas/WebGLContextObject.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLContextObjecth">trunk/Source/WebCore/html/canvas/WebGLContextObject.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDebugRendererInfocpp">trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDebugRendererInfoh">trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDebugShaderscpp">trunk/Source/WebCore/html/canvas/WebGLDebugShaders.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDebugShadersh">trunk/Source/WebCore/html/canvas/WebGLDebugShaders.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDepthTexturecpp">trunk/Source/WebCore/html/canvas/WebGLDepthTexture.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDepthTextureh">trunk/Source/WebCore/html/canvas/WebGLDepthTexture.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDrawBufferscpp">trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLDrawBuffersh">trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLExtensioncpp">trunk/Source/WebCore/html/canvas/WebGLExtension.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLExtensionh">trunk/Source/WebCore/html/canvas/WebGLExtension.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLFramebuffercpp">trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLFramebufferh">trunk/Source/WebCore/html/canvas/WebGLFramebuffer.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLLoseContextcpp">trunk/Source/WebCore/html/canvas/WebGLLoseContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLLoseContexth">trunk/Source/WebCore/html/canvas/WebGLLoseContext.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLObjectcpp">trunk/Source/WebCore/html/canvas/WebGLObject.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLObjecth">trunk/Source/WebCore/html/canvas/WebGLObject.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLProgramcpp">trunk/Source/WebCore/html/canvas/WebGLProgram.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLProgramh">trunk/Source/WebCore/html/canvas/WebGLProgram.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLQuerycpp">trunk/Source/WebCore/html/canvas/WebGLQuery.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLQueryh">trunk/Source/WebCore/html/canvas/WebGLQuery.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderbuffercpp">trunk/Source/WebCore/html/canvas/WebGLRenderbuffer.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderbufferh">trunk/Source/WebCore/html/canvas/WebGLRenderbuffer.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp">trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLSamplercpp">trunk/Source/WebCore/html/canvas/WebGLSampler.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLSamplerh">trunk/Source/WebCore/html/canvas/WebGLSampler.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLShadercpp">trunk/Source/WebCore/html/canvas/WebGLShader.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLShaderh">trunk/Source/WebCore/html/canvas/WebGLShader.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLSharedObjectcpp">trunk/Source/WebCore/html/canvas/WebGLSharedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLSharedObjecth">trunk/Source/WebCore/html/canvas/WebGLSharedObject.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLSynccpp">trunk/Source/WebCore/html/canvas/WebGLSync.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLSynch">trunk/Source/WebCore/html/canvas/WebGLSync.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLTexturecpp">trunk/Source/WebCore/html/canvas/WebGLTexture.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLTextureh">trunk/Source/WebCore/html/canvas/WebGLTexture.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLTransformFeedbackcpp">trunk/Source/WebCore/html/canvas/WebGLTransformFeedback.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLTransformFeedbackh">trunk/Source/WebCore/html/canvas/WebGLTransformFeedback.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectcpp">trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjecth">trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectBasecpp">trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectBase.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectBaseh">trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectBase.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectOEScpp">trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectOESh">trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh">trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseflGraphicsContext3DPrivatecpp">trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgpuTexturecpp">trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp">trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicssurfacesGLTransportSurfacecpp">trunk/Source/WebCore/platform/graphics/surfaces/GLTransportSurface.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapBitmapTextureGLcpp">trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/ChangeLog 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -1,3 +1,208 @@
</span><ins>+2016-11-14 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [WebGL] Migrate construction functions from pointers to references
+ https://bugs.webkit.org/show_bug.cgi?id=164749
+
+ Reviewed by Zalan Bujtas.
+
+ Mechanical find/replace.
+
+ No new tests because there is no behavior change.
+
+ * html/canvas/ANGLEInstancedArrays.cpp:
+ (WebCore::ANGLEInstancedArrays::ANGLEInstancedArrays):
+ (WebCore::ANGLEInstancedArrays::supported):
+ (WebCore::ANGLEInstancedArrays::drawArraysInstancedANGLE):
+ (WebCore::ANGLEInstancedArrays::drawElementsInstancedANGLE):
+ (WebCore::ANGLEInstancedArrays::vertexAttribDivisorANGLE):
+ * html/canvas/ANGLEInstancedArrays.h:
+ * html/canvas/EXTBlendMinMax.cpp:
+ (WebCore::EXTBlendMinMax::EXTBlendMinMax):
+ * html/canvas/EXTBlendMinMax.h:
+ * html/canvas/EXTFragDepth.cpp:
+ (WebCore::EXTFragDepth::EXTFragDepth):
+ * html/canvas/EXTFragDepth.h:
+ * html/canvas/EXTShaderTextureLOD.cpp:
+ (WebCore::EXTShaderTextureLOD::EXTShaderTextureLOD):
+ * html/canvas/EXTShaderTextureLOD.h:
+ * html/canvas/EXTTextureFilterAnisotropic.cpp:
+ (WebCore::EXTTextureFilterAnisotropic::EXTTextureFilterAnisotropic):
+ * html/canvas/EXTTextureFilterAnisotropic.h:
+ * html/canvas/EXTsRGB.cpp:
+ (WebCore::EXTsRGB::EXTsRGB):
+ * html/canvas/EXTsRGB.h:
+ * html/canvas/OESElementIndexUint.cpp:
+ (WebCore::OESElementIndexUint::OESElementIndexUint):
+ * html/canvas/OESElementIndexUint.h:
+ * html/canvas/OESStandardDerivatives.cpp:
+ (WebCore::OESStandardDerivatives::OESStandardDerivatives):
+ * html/canvas/OESStandardDerivatives.h:
+ * html/canvas/OESTextureFloat.cpp:
+ (WebCore::OESTextureFloat::OESTextureFloat):
+ * html/canvas/OESTextureFloat.h:
+ * html/canvas/OESTextureFloatLinear.cpp:
+ (WebCore::OESTextureFloatLinear::OESTextureFloatLinear):
+ * html/canvas/OESTextureFloatLinear.h:
+ * html/canvas/OESTextureHalfFloat.cpp:
+ (WebCore::OESTextureHalfFloat::OESTextureHalfFloat):
+ * html/canvas/OESTextureHalfFloat.h:
+ * html/canvas/OESTextureHalfFloatLinear.cpp:
+ (WebCore::OESTextureHalfFloatLinear::OESTextureHalfFloatLinear):
+ * html/canvas/OESTextureHalfFloatLinear.h:
+ * html/canvas/OESVertexArrayObject.cpp:
+ (WebCore::OESVertexArrayObject::OESVertexArrayObject):
+ (WebCore::OESVertexArrayObject::createVertexArrayOES):
+ (WebCore::OESVertexArrayObject::deleteVertexArrayOES):
+ (WebCore::OESVertexArrayObject::isVertexArrayOES):
+ (WebCore::OESVertexArrayObject::bindVertexArrayOES):
+ * html/canvas/WebGL2RenderingContext.cpp:
+ (WebCore::WebGL2RenderingContext::initializeVertexArrayObjects):
+ (WebCore::WebGL2RenderingContext::initializeShaderExtensions):
+ (WebCore::WebGL2RenderingContext::drawBuffers):
+ (WebCore::WebGL2RenderingContext::createVertexArray):
+ (WebCore::WebGL2RenderingContext::isVertexArray):
+ (WebCore::WebGL2RenderingContext::bindVertexArray):
+ (WebCore::WebGL2RenderingContext::getExtension):
+ (WebCore::WebGL2RenderingContext::getSupportedExtensions):
+ * html/canvas/WebGLBuffer.cpp:
+ (WebCore::WebGLBuffer::create):
+ (WebCore::WebGLBuffer::WebGLBuffer):
+ * html/canvas/WebGLBuffer.h:
+ * html/canvas/WebGLCompressedTextureATC.cpp:
+ (WebCore::WebGLCompressedTextureATC::WebGLCompressedTextureATC):
+ (WebCore::WebGLCompressedTextureATC::supported):
+ * html/canvas/WebGLCompressedTextureATC.h:
+ * html/canvas/WebGLCompressedTexturePVRTC.cpp:
+ (WebCore::WebGLCompressedTexturePVRTC::WebGLCompressedTexturePVRTC):
+ (WebCore::WebGLCompressedTexturePVRTC::supported):
+ * html/canvas/WebGLCompressedTexturePVRTC.h:
+ * html/canvas/WebGLCompressedTextureS3TC.cpp:
+ (WebCore::WebGLCompressedTextureS3TC::WebGLCompressedTextureS3TC):
+ (WebCore::WebGLCompressedTextureS3TC::supported):
+ * html/canvas/WebGLCompressedTextureS3TC.h:
+ * html/canvas/WebGLContextObject.cpp:
+ (WebCore::WebGLContextObject::WebGLContextObject):
+ * html/canvas/WebGLContextObject.h:
+ * html/canvas/WebGLDebugRendererInfo.cpp:
+ (WebCore::WebGLDebugRendererInfo::WebGLDebugRendererInfo):
+ * html/canvas/WebGLDebugRendererInfo.h:
+ * html/canvas/WebGLDebugShaders.cpp:
+ (WebCore::WebGLDebugShaders::WebGLDebugShaders):
+ (WebCore::WebGLDebugShaders::getTranslatedShaderSource):
+ * html/canvas/WebGLDebugShaders.h:
+ * html/canvas/WebGLDepthTexture.cpp:
+ (WebCore::WebGLDepthTexture::WebGLDepthTexture):
+ (WebCore::WebGLDepthTexture::supported):
+ * html/canvas/WebGLDepthTexture.h:
+ * html/canvas/WebGLDrawBuffers.cpp:
+ (WebCore::WebGLDrawBuffers::WebGLDrawBuffers):
+ (WebCore::WebGLDrawBuffers::supported):
+ (WebCore::WebGLDrawBuffers::drawBuffersWEBGL):
+ (WebCore::WebGLDrawBuffers::satisfiesWebGLRequirements):
+ * html/canvas/WebGLDrawBuffers.h:
+ * html/canvas/WebGLExtension.cpp:
+ (WebCore::WebGLExtension::WebGLExtension):
+ * html/canvas/WebGLExtension.h:
+ (WebCore::WebGLExtension::ref):
+ (WebCore::WebGLExtension::deref):
+ (WebCore::WebGLExtension::context):
+ * html/canvas/WebGLFramebuffer.cpp:
+ (WebCore::WebGLFramebuffer::create):
+ (WebCore::WebGLFramebuffer::WebGLFramebuffer):
+ (WebCore::WebGLFramebuffer::drawBuffersIfNecessary):
+ * html/canvas/WebGLFramebuffer.h:
+ * html/canvas/WebGLLoseContext.cpp:
+ (WebCore::WebGLLoseContext::WebGLLoseContext):
+ (WebCore::WebGLLoseContext::loseContext):
+ (WebCore::WebGLLoseContext::restoreContext):
+ * html/canvas/WebGLLoseContext.h:
+ * html/canvas/WebGLObject.cpp:
+ (WebCore::WebGLObject::WebGLObject):
+ * html/canvas/WebGLObject.h:
+ * html/canvas/WebGLProgram.cpp:
+ (WebCore::WebGLProgram::create):
+ (WebCore::WebGLProgram::WebGLProgram):
+ * html/canvas/WebGLProgram.h:
+ * html/canvas/WebGLQuery.cpp:
+ (WebCore::WebGLQuery::create):
+ (WebCore::WebGLQuery::WebGLQuery):
+ * html/canvas/WebGLQuery.h:
+ * html/canvas/WebGLRenderbuffer.cpp:
+ (WebCore::WebGLRenderbuffer::create):
+ (WebCore::WebGLRenderbuffer::WebGLRenderbuffer):
+ * html/canvas/WebGLRenderbuffer.h:
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::initializeVertexArrayObjects):
+ (WebCore::WebGLRenderingContext::getExtension):
+ (WebCore::WebGLRenderingContext::getSupportedExtensions):
+ * html/canvas/WebGLRenderingContextBase.cpp:
+ (WebCore::WebGLRenderingContextBase::create):
+ (WebCore::WebGLRenderingContextBase::setupFlags):
+ (WebCore::WebGLRenderingContextBase::checkObjectToBeBound):
+ (WebCore::WebGLRenderingContextBase::createBuffer):
+ (WebCore::WebGLRenderingContextBase::createFramebuffer):
+ (WebCore::WebGLRenderingContextBase::createTexture):
+ (WebCore::WebGLRenderingContextBase::createProgram):
+ (WebCore::WebGLRenderingContextBase::createRenderbuffer):
+ (WebCore::WebGLRenderingContextBase::createShader):
+ (WebCore::WebGLRenderingContextBase::deleteObject):
+ (WebCore::WebGLRenderingContextBase::validateWebGLObject):
+ (WebCore::WebGLRenderingContextBase::framebufferRenderbuffer):
+ (WebCore::WebGLRenderingContextBase::framebufferTexture2D):
+ (WebCore::WebGLRenderingContextBase::getUniform):
+ (WebCore::WebGLRenderingContextBase::readPixels):
+ (WebCore::WebGLRenderingContextBase::loseContextImpl):
+ (WebCore::WebGLRenderingContextBase::maybeRestoreContext):
+ (WebCore::WebGLRenderingContextBase::supportsDrawBuffers):
+ * html/canvas/WebGLSampler.cpp:
+ (WebCore::WebGLSampler::create):
+ (WebCore::WebGLSampler::WebGLSampler):
+ * html/canvas/WebGLSampler.h:
+ * html/canvas/WebGLShader.cpp:
+ (WebCore::WebGLShader::create):
+ (WebCore::WebGLShader::WebGLShader):
+ * html/canvas/WebGLShader.h:
+ * html/canvas/WebGLSharedObject.cpp:
+ (WebCore::WebGLSharedObject::WebGLSharedObject):
+ * html/canvas/WebGLSharedObject.h:
+ * html/canvas/WebGLSync.cpp:
+ (WebCore::WebGLSync::create):
+ (WebCore::WebGLSync::WebGLSync):
+ * html/canvas/WebGLSync.h:
+ * html/canvas/WebGLTexture.cpp:
+ (WebCore::WebGLTexture::create):
+ (WebCore::WebGLTexture::WebGLTexture):
+ * html/canvas/WebGLTexture.h:
+ * html/canvas/WebGLTransformFeedback.cpp:
+ (WebCore::WebGLTransformFeedback::create):
+ (WebCore::WebGLTransformFeedback::WebGLTransformFeedback):
+ * html/canvas/WebGLTransformFeedback.h:
+ * html/canvas/WebGLVertexArrayObject.cpp:
+ (WebCore::WebGLVertexArrayObject::create):
+ (WebCore::WebGLVertexArrayObject::WebGLVertexArrayObject):
+ * html/canvas/WebGLVertexArrayObject.h:
+ * html/canvas/WebGLVertexArrayObjectBase.cpp:
+ (WebCore::WebGLVertexArrayObjectBase::WebGLVertexArrayObjectBase):
+ * html/canvas/WebGLVertexArrayObjectBase.h:
+ * html/canvas/WebGLVertexArrayObjectOES.cpp:
+ (WebCore::WebGLVertexArrayObjectOES::create):
+ (WebCore::WebGLVertexArrayObjectOES::WebGLVertexArrayObjectOES):
+ (WebCore::WebGLVertexArrayObjectOES::deleteObjectImpl):
+ * html/canvas/WebGLVertexArrayObjectOES.h:
+ * platform/graphics/GraphicsContext3D.h:
+ * platform/graphics/gpu/Texture.cpp:
+ (WebCore::convertFormat):
+ * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+ (WebCore::GraphicsContext3D::readPixelsAndConvertToBGRAIfNecessary):
+ (WebCore::GraphicsContext3D::reshapeFBOs):
+ (WebCore::GraphicsContext3D::getIntegerv):
+ (WebCore::GraphicsContext3D::getExtensions):
+ * platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+ (WebCore::GraphicsContext3D::validateDepthStencil):
+ (WebCore::GraphicsContext3D::drawArraysInstanced):
+ (WebCore::GraphicsContext3D::drawElementsInstanced):
+ (WebCore::GraphicsContext3D::vertexAttribDivisor):
+
</ins><span class="cx"> 2016-11-15 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: Need to update implicit/default values for aria-valuemin, aria-valuenow, and aria-valuemax
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasANGLEInstancedArrayscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ANGLEInstancedArrays::ANGLEInstancedArrays(WebGLRenderingContextBase* context)
</del><ins>+ANGLEInstancedArrays::ANGLEInstancedArrays(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -48,14 +48,13 @@
</span><span class="cx"> return ANGLEInstancedArraysName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ANGLEInstancedArrays::supported(WebGLRenderingContextBase* context)
</del><ins>+bool ANGLEInstancedArrays::supported(WebGLRenderingContextBase& context)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> return true;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>- Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
- return extensions->supports("GL_ANGLE_instanced_arrays");
</del><ins>+ return context.graphicsContext3D()->getExtensions().supports("GL_ANGLE_instanced_arrays");
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> return false;
</span><span class="lines">@@ -64,23 +63,23 @@
</span><span class="cx">
</span><span class="cx"> void ANGLEInstancedArrays::drawArraysInstancedANGLE(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
</span><span class="cx"> {
</span><del>- if (m_context->isContextLost())
</del><ins>+ if (m_context.isContextLost())
</ins><span class="cx"> return;
</span><del>- m_context->drawArraysInstanced(mode, first, count, primcount);
</del><ins>+ m_context.drawArraysInstanced(mode, first, count, primcount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ANGLEInstancedArrays::drawElementsInstancedANGLE(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, GC3Dsizei primcount)
</span><span class="cx"> {
</span><del>- if (m_context->isContextLost())
</del><ins>+ if (m_context.isContextLost())
</ins><span class="cx"> return;
</span><del>- m_context->drawElementsInstanced(mode, count, type, offset, primcount);
</del><ins>+ m_context.drawElementsInstanced(mode, count, type, offset, primcount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ANGLEInstancedArrays::vertexAttribDivisorANGLE(GC3Duint index, GC3Duint divisor)
</span><span class="cx"> {
</span><del>- if (m_context->isContextLost())
</del><ins>+ if (m_context.isContextLost())
</ins><span class="cx"> return;
</span><del>- m_context->vertexAttribDivisor(index, divisor);
</del><ins>+ m_context.vertexAttribDivisor(index, divisor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasANGLEInstancedArraysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/ANGLEInstancedArrays.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,12 +33,12 @@
</span><span class="cx">
</span><span class="cx"> class ANGLEInstancedArrays final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit ANGLEInstancedArrays(WebGLRenderingContextBase*);
</del><ins>+ explicit ANGLEInstancedArrays(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~ANGLEInstancedArrays();
</span><span class="cx">
</span><span class="cx"> virtual ExtensionName getName() const;
</span><span class="cx">
</span><del>- static bool supported(WebGLRenderingContextBase*);
</del><ins>+ static bool supported(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void drawArraysInstancedANGLE(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount);
</span><span class="cx"> void drawElementsInstancedANGLE(GC3Denum mode, GC3Dsizei count, GC3Denum type, long long offset, GC3Dsizei primcount);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTBlendMinMaxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTBlendMinMax.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTBlendMinMax.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/EXTBlendMinMax.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-EXTBlendMinMax::EXTBlendMinMax(WebGLRenderingContextBase* context)
</del><ins>+EXTBlendMinMax::EXTBlendMinMax(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTBlendMinMaxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTBlendMinMax.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTBlendMinMax.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/EXTBlendMinMax.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class EXTBlendMinMax final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit EXTBlendMinMax(WebGLRenderingContextBase*);
</del><ins>+ explicit EXTBlendMinMax(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~EXTBlendMinMax();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTFragDepthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTFragDepth.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTFragDepth.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/EXTFragDepth.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-EXTFragDepth::EXTFragDepth(WebGLRenderingContextBase* context)
</del><ins>+EXTFragDepth::EXTFragDepth(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTFragDepthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTFragDepth.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTFragDepth.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/EXTFragDepth.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class EXTFragDepth final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit EXTFragDepth(WebGLRenderingContextBase*);
</del><ins>+ explicit EXTFragDepth(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~EXTFragDepth();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTShaderTextureLODcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTShaderTextureLOD.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTShaderTextureLOD.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/EXTShaderTextureLOD.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-EXTShaderTextureLOD::EXTShaderTextureLOD(WebGLRenderingContextBase* context)
</del><ins>+EXTShaderTextureLOD::EXTShaderTextureLOD(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTShaderTextureLODh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTShaderTextureLOD.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTShaderTextureLOD.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/EXTShaderTextureLOD.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class EXTShaderTextureLOD final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit EXTShaderTextureLOD(WebGLRenderingContextBase*);
</del><ins>+ explicit EXTShaderTextureLOD(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~EXTShaderTextureLOD();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTTextureFilterAnisotropiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-EXTTextureFilterAnisotropic::EXTTextureFilterAnisotropic(WebGLRenderingContextBase* context)
</del><ins>+EXTTextureFilterAnisotropic::EXTTextureFilterAnisotropic(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTTextureFilterAnisotropich"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/EXTTextureFilterAnisotropic.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class EXTTextureFilterAnisotropic final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit EXTTextureFilterAnisotropic(WebGLRenderingContextBase*);
</del><ins>+ explicit EXTTextureFilterAnisotropic(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~EXTTextureFilterAnisotropic();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTsRGBcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTsRGB.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTsRGB.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/EXTsRGB.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-EXTsRGB::EXTsRGB(WebGLRenderingContextBase* context)
</del><ins>+EXTsRGB::EXTsRGB(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasEXTsRGBh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/EXTsRGB.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/EXTsRGB.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/EXTsRGB.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class EXTsRGB final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit EXTsRGB(WebGLRenderingContextBase*);
</del><ins>+ explicit EXTsRGB(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~EXTsRGB();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESElementIndexUintcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESElementIndexUint.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESElementIndexUint.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESElementIndexUint.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-OESElementIndexUint::OESElementIndexUint(WebGLRenderingContextBase* context)
</del><ins>+OESElementIndexUint::OESElementIndexUint(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESElementIndexUinth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESElementIndexUint.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESElementIndexUint.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESElementIndexUint.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class OESElementIndexUint final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit OESElementIndexUint(WebGLRenderingContextBase*);
</del><ins>+ explicit OESElementIndexUint(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~OESElementIndexUint();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESStandardDerivativescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESStandardDerivatives.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESStandardDerivatives.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESStandardDerivatives.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-OESStandardDerivatives::OESStandardDerivatives(WebGLRenderingContextBase* context)
</del><ins>+OESStandardDerivatives::OESStandardDerivatives(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESStandardDerivativesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESStandardDerivatives.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESStandardDerivatives.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESStandardDerivatives.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class OESStandardDerivatives final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit OESStandardDerivatives(WebGLRenderingContextBase*);
</del><ins>+ explicit OESStandardDerivatives(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~OESStandardDerivatives();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureFloatcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESTextureFloat.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureFloat.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESTextureFloat.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-OESTextureFloat::OESTextureFloat(WebGLRenderingContextBase* context)
</del><ins>+OESTextureFloat::OESTextureFloat(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureFloath"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESTextureFloat.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureFloat.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESTextureFloat.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class OESTextureFloat final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- OESTextureFloat(WebGLRenderingContextBase*);
</del><ins>+ OESTextureFloat(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~OESTextureFloat();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureFloatLinearcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-OESTextureFloatLinear::OESTextureFloatLinear(WebGLRenderingContextBase* context)
</del><ins>+OESTextureFloatLinear::OESTextureFloatLinear(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureFloatLinearh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESTextureFloatLinear.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class OESTextureFloatLinear final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit OESTextureFloatLinear(WebGLRenderingContextBase*);
</del><ins>+ explicit OESTextureFloatLinear(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~OESTextureFloatLinear();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureHalfFloatcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-OESTextureHalfFloat::OESTextureHalfFloat(WebGLRenderingContextBase* context)
</del><ins>+OESTextureHalfFloat::OESTextureHalfFloat(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureHalfFloath"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESTextureHalfFloat.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class OESTextureHalfFloat final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- OESTextureHalfFloat(WebGLRenderingContextBase*);
</del><ins>+ OESTextureHalfFloat(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~OESTextureHalfFloat();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureHalfFloatLinearcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-OESTextureHalfFloatLinear::OESTextureHalfFloatLinear(WebGLRenderingContextBase* context)
</del><ins>+OESTextureHalfFloatLinear::OESTextureHalfFloatLinear(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESTextureHalfFloatLinearh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESTextureHalfFloatLinear.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> class OESTextureHalfFloatLinear final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- OESTextureHalfFloatLinear(WebGLRenderingContextBase*);
</del><ins>+ OESTextureHalfFloatLinear(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~OESTextureHalfFloatLinear();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasOESVertexArrayObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/OESVertexArrayObject.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/OESVertexArrayObject.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/OESVertexArrayObject.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> OESVertexArrayObject::OESVertexArrayObject(WebGLRenderingContextBase& context)
</span><del>- : WebGLExtension(&context)
</del><ins>+ : WebGLExtension(context)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -46,43 +46,43 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebGLVertexArrayObjectOES> OESVertexArrayObject::createVertexArrayOES()
</span><span class="cx"> {
</span><del>- if (m_context->isContextLost())
</del><ins>+ if (m_context.isContextLost())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> auto object = WebGLVertexArrayObjectOES::create(m_context, WebGLVertexArrayObjectOES::VAOTypeUser);
</span><del>- m_context->addContextObject(object.ptr());
</del><ins>+ m_context.addContextObject(object.ptr());
</ins><span class="cx"> return WTFMove(object);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void OESVertexArrayObject::deleteVertexArrayOES(WebGLVertexArrayObjectOES* arrayObject)
</span><span class="cx"> {
</span><del>- if (!arrayObject || m_context->isContextLost())
</del><ins>+ if (!arrayObject || m_context.isContextLost())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!arrayObject->isDefaultObject() && arrayObject == static_cast<WebGLRenderingContext*>(m_context)->m_boundVertexArrayObject)
- static_cast<WebGLRenderingContext*>(m_context)->setBoundVertexArrayObject(0);
</del><ins>+ if (!arrayObject->isDefaultObject() && arrayObject == static_cast<WebGLRenderingContext*>(&m_context)->m_boundVertexArrayObject)
+ static_cast<WebGLRenderingContext*>(&m_context)->setBoundVertexArrayObject(0);
</ins><span class="cx">
</span><del>- arrayObject->deleteObject(m_context->graphicsContext3D());
</del><ins>+ arrayObject->deleteObject(m_context.graphicsContext3D());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GC3Dboolean OESVertexArrayObject::isVertexArrayOES(WebGLVertexArrayObjectOES* arrayObject)
</span><span class="cx"> {
</span><del>- return arrayObject && !m_context->isContextLost() && arrayObject->hasEverBeenBound()
- && m_context->graphicsContext3D()->getExtensions()->isVertexArrayOES(arrayObject->object());
</del><ins>+ return arrayObject && !m_context.isContextLost() && arrayObject->hasEverBeenBound()
+ && m_context.graphicsContext3D()->getExtensions().isVertexArrayOES(arrayObject->object());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void OESVertexArrayObject::bindVertexArrayOES(WebGLVertexArrayObjectOES* arrayObject)
</span><span class="cx"> {
</span><del>- if (m_context->isContextLost())
</del><ins>+ if (m_context.isContextLost())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (arrayObject && (arrayObject->isDeleted() || !arrayObject->validate(0, context()))) {
- m_context->graphicsContext3D()->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
</del><ins>+ if (arrayObject && (arrayObject->isDeleted() || !arrayObject->validate(nullptr, context()))) {
+ m_context.graphicsContext3D()->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto& extensions = *m_context->graphicsContext3D()->getExtensions();
- auto& context = downcast<WebGLRenderingContext>(*m_context);
</del><ins>+ auto& extensions = m_context.graphicsContext3D()->getExtensions();
+ auto& context = downcast<WebGLRenderingContext>(m_context);
</ins><span class="cx"> if (arrayObject && !arrayObject->isDefaultObject() && arrayObject->object()) {
</span><span class="cx"> extensions.bindVertexArrayOES(arrayObject->object());
</span><span class="cx"> arrayObject->setHasEverBeenBound();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGL2RenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGL2RenderingContext.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> void WebGL2RenderingContext::initializeVertexArrayObjects()
</span><span class="cx"> {
</span><del>- m_defaultVertexArrayObject = WebGLVertexArrayObject::create(this, WebGLVertexArrayObject::VAOTypeDefault);
</del><ins>+ m_defaultVertexArrayObject = WebGLVertexArrayObject::create(*this, WebGLVertexArrayObject::VAOTypeDefault);
</ins><span class="cx"> addContextObject(m_defaultVertexArrayObject.get());
</span><span class="cx"> m_boundVertexArrayObject = m_defaultVertexArrayObject;
</span><span class="cx"> if (!isGLES2Compliant())
</span><span class="lines">@@ -82,10 +82,10 @@
</span><span class="cx">
</span><span class="cx"> void WebGL2RenderingContext::initializeShaderExtensions()
</span><span class="cx"> {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_standard_derivatives");
- m_context->getExtensions()->ensureEnabled("GL_EXT_draw_buffers");
- m_context->getExtensions()->ensureEnabled("GL_EXT_shader_texture_lod");
- m_context->getExtensions()->ensureEnabled("GL_EXT_frag_depth");
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_standard_derivatives");
+ m_context->getExtensions().ensureEnabled("GL_EXT_draw_buffers");
+ m_context->getExtensions().ensureEnabled("GL_EXT_shader_texture_lod");
+ m_context->getExtensions().ensureEnabled("GL_EXT_frag_depth");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline static Optional<unsigned> arrayBufferViewElementSize(const ArrayBufferView& data)
</span><span class="lines">@@ -494,7 +494,7 @@
</span><span class="cx"> }
</span><span class="cx"> // Because the backbuffer is simulated on all current WebKit ports, we need to change BACK to COLOR_ATTACHMENT0.
</span><span class="cx"> GC3Denum value = (bufs[0] == GraphicsContext3D::BACK) ? GraphicsContext3D::COLOR_ATTACHMENT0 : GraphicsContext3D::NONE;
</span><del>- graphicsContext3D()->getExtensions()->drawBuffersEXT(1, &value);
</del><ins>+ graphicsContext3D()->getExtensions().drawBuffersEXT(1, &value);
</ins><span class="cx"> setBackDrawBuffer(bufs[0]);
</span><span class="cx"> } else {
</span><span class="cx"> if (n > getMaxDrawBuffers()) {
</span><span class="lines">@@ -794,7 +794,7 @@
</span><span class="cx"> if (isContextLost())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto object = WebGLVertexArrayObject::create(this, WebGLVertexArrayObject::VAOTypeUser);
</del><ins>+ auto object = WebGLVertexArrayObject::create(*this, WebGLVertexArrayObject::VAOTypeUser);
</ins><span class="cx"> addContextObject(object.ptr());
</span><span class="cx"> return WTFMove(object);
</span><span class="cx"> }
</span><span class="lines">@@ -818,7 +818,7 @@
</span><span class="cx"> if (!arrayObject || isContextLost())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (!arrayObject->hasEverBeenBound() || !arrayObject->validate(0, this))
</del><ins>+ if (!arrayObject->hasEverBeenBound() || !arrayObject->validate(0, *this))
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> return m_context->isVertexArray(arrayObject->object());
</span><span class="lines">@@ -829,7 +829,7 @@
</span><span class="cx"> if (isContextLost())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (arrayObject && (arrayObject->isDeleted() || !arrayObject->validate(0, this) || !m_contextObjects.contains(arrayObject))) {
</del><ins>+ if (arrayObject && (arrayObject->isDeleted() || !arrayObject->validate(0, *this) || !m_contextObjects.contains(arrayObject))) {
</ins><span class="cx"> m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -850,85 +850,85 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if ((equalIgnoringASCIICase(name, "EXT_texture_filter_anisotropic") || equalIgnoringASCIICase(name, "WEBKIT_EXT_texture_filter_anisotropic"))
</span><del>- && m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic")) {
</del><ins>+ && m_context->getExtensions().supports("GL_EXT_texture_filter_anisotropic")) {
</ins><span class="cx"> if (!m_extTextureFilterAnisotropic) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_EXT_texture_filter_anisotropic");
- m_extTextureFilterAnisotropic = std::make_unique<EXTTextureFilterAnisotropic>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_EXT_texture_filter_anisotropic");
+ m_extTextureFilterAnisotropic = std::make_unique<EXTTextureFilterAnisotropic>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_extTextureFilterAnisotropic.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_texture_float")
</span><del>- && m_context->getExtensions()->supports("GL_OES_texture_float")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_texture_float")) {
</ins><span class="cx"> if (!m_oesTextureFloat) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_texture_float");
- m_oesTextureFloat = std::make_unique<OESTextureFloat>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_texture_float");
+ m_oesTextureFloat = std::make_unique<OESTextureFloat>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_oesTextureFloat.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_texture_float_linear")
</span><del>- && m_context->getExtensions()->supports("GL_OES_texture_float_linear")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_texture_float_linear")) {
</ins><span class="cx"> if (!m_oesTextureFloatLinear) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_texture_float_linear");
- m_oesTextureFloatLinear = std::make_unique<OESTextureFloatLinear>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_texture_float_linear");
+ m_oesTextureFloatLinear = std::make_unique<OESTextureFloatLinear>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_oesTextureFloatLinear.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_texture_half_float")
</span><del>- && m_context->getExtensions()->supports("GL_OES_texture_half_float")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_texture_half_float")) {
</ins><span class="cx"> if (!m_oesTextureHalfFloat) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_texture_half_float");
- m_oesTextureHalfFloat = std::make_unique<OESTextureHalfFloat>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_texture_half_float");
+ m_oesTextureHalfFloat = std::make_unique<OESTextureHalfFloat>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_oesTextureHalfFloat.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_texture_half_float_linear")
</span><del>- && m_context->getExtensions()->supports("GL_OES_texture_half_float_linear")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_texture_half_float_linear")) {
</ins><span class="cx"> if (!m_oesTextureHalfFloatLinear) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_texture_half_float_linear");
- m_oesTextureHalfFloatLinear = std::make_unique<OESTextureHalfFloatLinear>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_texture_half_float_linear");
+ m_oesTextureHalfFloatLinear = std::make_unique<OESTextureHalfFloatLinear>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_oesTextureHalfFloatLinear.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_lose_context")) {
</span><span class="cx"> if (!m_webglLoseContext)
</span><del>- m_webglLoseContext = std::make_unique<WebGLLoseContext>(this);
</del><ins>+ m_webglLoseContext = std::make_unique<WebGLLoseContext>(*this);
</ins><span class="cx"> return m_webglLoseContext.get();
</span><span class="cx"> }
</span><span class="cx"> if ((equalIgnoringASCIICase(name, "WEBKIT_WEBGL_compressed_texture_atc"))
</span><del>- && WebGLCompressedTextureATC::supported(this)) {
</del><ins>+ && WebGLCompressedTextureATC::supported(*this)) {
</ins><span class="cx"> if (!m_webglCompressedTextureATC)
</span><del>- m_webglCompressedTextureATC = std::make_unique<WebGLCompressedTextureATC>(this);
</del><ins>+ m_webglCompressedTextureATC = std::make_unique<WebGLCompressedTextureATC>(*this);
</ins><span class="cx"> return m_webglCompressedTextureATC.get();
</span><span class="cx"> }
</span><span class="cx"> if ((equalIgnoringASCIICase(name, "WEBKIT_WEBGL_compressed_texture_pvrtc"))
</span><del>- && WebGLCompressedTexturePVRTC::supported(this)) {
</del><ins>+ && WebGLCompressedTexturePVRTC::supported(*this)) {
</ins><span class="cx"> if (!m_webglCompressedTexturePVRTC)
</span><del>- m_webglCompressedTexturePVRTC = std::make_unique<WebGLCompressedTexturePVRTC>(this);
</del><ins>+ m_webglCompressedTexturePVRTC = std::make_unique<WebGLCompressedTexturePVRTC>(*this);
</ins><span class="cx"> return m_webglCompressedTexturePVRTC.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_compressed_texture_s3tc")
</span><del>- && WebGLCompressedTextureS3TC::supported(this)) {
</del><ins>+ && WebGLCompressedTextureS3TC::supported(*this)) {
</ins><span class="cx"> if (!m_webglCompressedTextureS3TC)
</span><del>- m_webglCompressedTextureS3TC = std::make_unique<WebGLCompressedTextureS3TC>(this);
</del><ins>+ m_webglCompressedTextureS3TC = std::make_unique<WebGLCompressedTextureS3TC>(*this);
</ins><span class="cx"> return m_webglCompressedTextureS3TC.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_depth_texture")
</span><del>- && WebGLDepthTexture::supported(graphicsContext3D())) {
</del><ins>+ && WebGLDepthTexture::supported(*graphicsContext3D())) {
</ins><span class="cx"> if (!m_webglDepthTexture) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_CHROMIUM_depth_texture");
- m_webglDepthTexture = std::make_unique<WebGLDepthTexture>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_CHROMIUM_depth_texture");
+ m_webglDepthTexture = std::make_unique<WebGLDepthTexture>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_webglDepthTexture.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_debug_renderer_info")) {
</span><span class="cx"> if (!m_webglDebugRendererInfo)
</span><del>- m_webglDebugRendererInfo = std::make_unique<WebGLDebugRendererInfo>(this);
</del><ins>+ m_webglDebugRendererInfo = std::make_unique<WebGLDebugRendererInfo>(*this);
</ins><span class="cx"> return m_webglDebugRendererInfo.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_debug_shaders")
</span><del>- && m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source")) {
</del><ins>+ && m_context->getExtensions().supports("GL_ANGLE_translated_shader_source")) {
</ins><span class="cx"> if (!m_webglDebugShaders)
</span><del>- m_webglDebugShaders = std::make_unique<WebGLDebugShaders>(this);
</del><ins>+ m_webglDebugShaders = std::make_unique<WebGLDebugShaders>(*this);
</ins><span class="cx"> return m_webglDebugShaders.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -942,26 +942,26 @@
</span><span class="cx"> if (m_isPendingPolicyResolution)
</span><span class="cx"> return result;
</span><span class="cx">
</span><del>- if (m_context->getExtensions()->supports("GL_OES_texture_float"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_texture_float"))
</ins><span class="cx"> result.append("OES_texture_float");
</span><del>- if (m_context->getExtensions()->supports("GL_OES_texture_float_linear"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_texture_float_linear"))
</ins><span class="cx"> result.append("OES_texture_float_linear");
</span><del>- if (m_context->getExtensions()->supports("GL_OES_texture_half_float"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_texture_half_float"))
</ins><span class="cx"> result.append("OES_texture_half_float");
</span><del>- if (m_context->getExtensions()->supports("GL_OES_texture_half_float_linear"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_texture_half_float_linear"))
</ins><span class="cx"> result.append("OES_texture_half_float_linear");
</span><del>- if (m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic"))
</del><ins>+ if (m_context->getExtensions().supports("GL_EXT_texture_filter_anisotropic"))
</ins><span class="cx"> result.append("WEBKIT_EXT_texture_filter_anisotropic");
</span><del>- if (WebGLCompressedTextureATC::supported(this))
</del><ins>+ if (WebGLCompressedTextureATC::supported(*this))
</ins><span class="cx"> result.append("WEBKIT_WEBGL_compressed_texture_atc");
</span><del>- if (WebGLCompressedTexturePVRTC::supported(this))
</del><ins>+ if (WebGLCompressedTexturePVRTC::supported(*this))
</ins><span class="cx"> result.append("WEBKIT_WEBGL_compressed_texture_pvrtc");
</span><del>- if (WebGLCompressedTextureS3TC::supported(this))
</del><ins>+ if (WebGLCompressedTextureS3TC::supported(*this))
</ins><span class="cx"> result.append("WEBGL_compressed_texture_s3tc");
</span><del>- if (WebGLDepthTexture::supported(graphicsContext3D()))
</del><ins>+ if (WebGLDepthTexture::supported(*graphicsContext3D()))
</ins><span class="cx"> result.append("WEBGL_depth_texture");
</span><span class="cx"> result.append("WEBGL_lose_context");
</span><del>- if (m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source"))
</del><ins>+ if (m_context->getExtensions().supports("GL_ANGLE_translated_shader_source"))
</ins><span class="cx"> result.append("WEBGL_debug_shaders");
</span><span class="cx"> result.append("WEBGL_debug_renderer_info");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLBuffer.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLBuffer.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLBuffer.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -34,18 +34,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContextBase* ctx)
</del><ins>+Ref<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLBuffer(ctx));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx)
</del><ins>+WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> : WebGLSharedObject(ctx)
</span><span class="cx"> , m_target(0)
</span><span class="cx"> , m_byteLength(0)
</span><span class="cx"> , m_nextAvailableCacheEntry(0)
</span><span class="cx"> {
</span><del>- setObject(ctx->graphicsContext3D()->createBuffer());
</del><ins>+ setObject(ctx.graphicsContext3D()->createBuffer());
</ins><span class="cx"> clearCachedMaxIndices();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLBuffer.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLBuffer.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLBuffer.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebGLBuffer();
</span><span class="cx">
</span><del>- static Ref<WebGLBuffer> create(WebGLRenderingContextBase*);
</del><ins>+ static Ref<WebGLBuffer> create(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> bool associateBufferData(GC3Dsizeiptr size);
</span><span class="cx"> bool associateBufferData(JSC::ArrayBuffer*);
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> bool hasEverBeenBound() const { return object() && m_target; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLBuffer(WebGLRenderingContextBase*);
</del><ins>+ WebGLBuffer(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLCompressedTextureATCcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,12 +33,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLCompressedTextureATC::WebGLCompressedTextureATC(WebGLRenderingContextBase* context)
</del><ins>+WebGLCompressedTextureATC::WebGLCompressedTextureATC(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><del>- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_ATC_RGB_AMD);
- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_ATC_RGBA_EXPLICIT_ALPHA_AMD);
- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_ATC_RGBA_INTERPOLATED_ALPHA_AMD);
</del><ins>+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_ATC_RGB_AMD);
+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_ATC_RGBA_EXPLICIT_ALPHA_AMD);
+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_ATC_RGBA_INTERPOLATED_ALPHA_AMD);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLCompressedTextureATC::~WebGLCompressedTextureATC()
</span><span class="lines">@@ -50,10 +50,9 @@
</span><span class="cx"> return WebGLCompressedTextureATCName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLCompressedTextureATC::supported(WebGLRenderingContextBase* context)
</del><ins>+bool WebGLCompressedTextureATC::supported(WebGLRenderingContextBase& context)
</ins><span class="cx"> {
</span><del>- Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
- return extensions->supports("GL_AMD_compressed_ATC_texture");
</del><ins>+ return context.graphicsContext3D()->getExtensions().supports("GL_AMD_compressed_ATC_texture");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLCompressedTextureATCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLCompressedTextureATC.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx">
</span><span class="cx"> class WebGLCompressedTextureATC final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit WebGLCompressedTextureATC(WebGLRenderingContextBase*);
</del><ins>+ explicit WebGLCompressedTextureATC(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~WebGLCompressedTextureATC();
</span><span class="cx">
</span><del>- static bool supported(WebGLRenderingContextBase*);
</del><ins>+ static bool supported(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLCompressedTexturePVRTCcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -34,13 +34,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLCompressedTexturePVRTC::WebGLCompressedTexturePVRTC(WebGLRenderingContextBase* context)
</del><ins>+WebGLCompressedTexturePVRTC::WebGLCompressedTexturePVRTC(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><del>- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGB_PVRTC_4BPPV1_IMG);
- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGB_PVRTC_2BPPV1_IMG);
- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_PVRTC_4BPPV1_IMG);
- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_PVRTC_2BPPV1_IMG);
</del><ins>+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGB_PVRTC_4BPPV1_IMG);
+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGB_PVRTC_2BPPV1_IMG);
+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_PVRTC_4BPPV1_IMG);
+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_PVRTC_2BPPV1_IMG);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLCompressedTexturePVRTC::~WebGLCompressedTexturePVRTC()
</span><span class="lines">@@ -52,10 +52,9 @@
</span><span class="cx"> return WebGLCompressedTexturePVRTCName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLCompressedTexturePVRTC::supported(WebGLRenderingContextBase* context)
</del><ins>+bool WebGLCompressedTexturePVRTC::supported(WebGLRenderingContextBase& context)
</ins><span class="cx"> {
</span><del>- Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
- return extensions->supports("GL_IMG_texture_compression_pvrtc");
</del><ins>+ return context.graphicsContext3D()->getExtensions().supports("GL_IMG_texture_compression_pvrtc");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLCompressedTexturePVRTCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLCompressedTexturePVRTC.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx">
</span><span class="cx"> class WebGLCompressedTexturePVRTC final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit WebGLCompressedTexturePVRTC(WebGLRenderingContextBase*);
</del><ins>+ explicit WebGLCompressedTexturePVRTC(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~WebGLCompressedTexturePVRTC();
</span><span class="cx">
</span><del>- static bool supported(WebGLRenderingContextBase*);
</del><ins>+ static bool supported(WebGLRenderingContextBase&);
</ins><span class="cx"> ExtensionName getName() const override;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLCompressedTextureS3TCcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -34,13 +34,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLCompressedTextureS3TC::WebGLCompressedTextureS3TC(WebGLRenderingContextBase* context)
</del><ins>+WebGLCompressedTextureS3TC::WebGLCompressedTextureS3TC(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><del>- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGB_S3TC_DXT1_EXT);
- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT1_EXT);
- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT3_EXT);
- context->addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT5_EXT);
</del><ins>+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGB_S3TC_DXT1_EXT);
+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT1_EXT);
+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT3_EXT);
+ context.addCompressedTextureFormat(Extensions3D::COMPRESSED_RGBA_S3TC_DXT5_EXT);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLCompressedTextureS3TC::~WebGLCompressedTextureS3TC()
</span><span class="lines">@@ -52,13 +52,13 @@
</span><span class="cx"> return WebGLCompressedTextureS3TCName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLCompressedTextureS3TC::supported(WebGLRenderingContextBase* context)
</del><ins>+bool WebGLCompressedTextureS3TC::supported(WebGLRenderingContextBase& context)
</ins><span class="cx"> {
</span><del>- Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
- return extensions->supports("GL_EXT_texture_compression_s3tc")
- || (extensions->supports("GL_EXT_texture_compression_dxt1")
- && extensions->supports("GL_CHROMIUM_texture_compression_dxt3")
- && extensions->supports("GL_CHROMIUM_texture_compression_dxt5"));
</del><ins>+ auto& extensions = context.graphicsContext3D()->getExtensions();
+ return extensions.supports("GL_EXT_texture_compression_s3tc")
+ || (extensions.supports("GL_EXT_texture_compression_dxt1")
+ && extensions.supports("GL_CHROMIUM_texture_compression_dxt3")
+ && extensions.supports("GL_CHROMIUM_texture_compression_dxt5"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLCompressedTextureS3TCh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLCompressedTextureS3TC.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx">
</span><span class="cx"> class WebGLCompressedTextureS3TC final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit WebGLCompressedTextureS3TC(WebGLRenderingContextBase*);
</del><ins>+ explicit WebGLCompressedTextureS3TC(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~WebGLCompressedTextureS3TC();
</span><span class="cx">
</span><del>- static bool supported(WebGLRenderingContextBase*);
</del><ins>+ static bool supported(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLContextObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLContextObject.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLContextObject.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLContextObject.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase* context)
</del><ins>+WebGLContextObject::WebGLContextObject(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLObject(context)
</span><del>- , m_context(context)
</del><ins>+ , m_context(&context)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLContextObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLContextObject.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLContextObject.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLContextObject.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -40,15 +40,15 @@
</span><span class="cx">
</span><span class="cx"> WebGLRenderingContextBase* context() const { return m_context; }
</span><span class="cx">
</span><del>- bool validate(const WebGLContextGroup*, const WebGLRenderingContextBase* context) const override
</del><ins>+ bool validate(const WebGLContextGroup*, const WebGLRenderingContextBase& context) const override
</ins><span class="cx"> {
</span><del>- return context == m_context;
</del><ins>+ return &context == m_context;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void detachContext();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLContextObject(WebGLRenderingContextBase*);
</del><ins>+ WebGLContextObject(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> bool hasGroupOrContext() const override
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDebugRendererInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLDebugRendererInfo::WebGLDebugRendererInfo(WebGLRenderingContextBase* context)
</del><ins>+WebGLDebugRendererInfo::WebGLDebugRendererInfo(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDebugRendererInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLDebugRendererInfo.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> UNMASKED_RENDERER_WEBGL = 0x9246
</span><span class="cx"> };
</span><span class="cx">
</span><del>- explicit WebGLDebugRendererInfo(WebGLRenderingContextBase*);
</del><ins>+ explicit WebGLDebugRendererInfo(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~WebGLDebugRendererInfo();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDebugShaderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDebugShaders.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDebugShaders.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLDebugShaders.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLDebugShaders::WebGLDebugShaders(WebGLRenderingContextBase* context)
</del><ins>+WebGLDebugShaders::WebGLDebugShaders(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -51,11 +51,11 @@
</span><span class="cx">
</span><span class="cx"> String WebGLDebugShaders::getTranslatedShaderSource(WebGLShader* shader)
</span><span class="cx"> {
</span><del>- if (m_context->isContextLost())
</del><ins>+ if (m_context.isContextLost())
</ins><span class="cx"> return String();
</span><del>- if (!m_context->validateWebGLObject("getTranslatedShaderSource", shader))
</del><ins>+ if (!m_context.validateWebGLObject("getTranslatedShaderSource", shader))
</ins><span class="cx"> return emptyString();
</span><del>- return m_context->graphicsContext3D()->getExtensions()->getTranslatedShaderSourceANGLE(shader->object());
</del><ins>+ return m_context.graphicsContext3D()->getExtensions().getTranslatedShaderSourceANGLE(shader->object());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDebugShadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDebugShaders.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDebugShaders.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLDebugShaders.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> class WebGLDebugShaders final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit WebGLDebugShaders(WebGLRenderingContextBase*);
</del><ins>+ explicit WebGLDebugShaders(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~WebGLDebugShaders();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDepthTexturecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDepthTexture.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDepthTexture.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLDepthTexture.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLDepthTexture::WebGLDepthTexture(WebGLRenderingContextBase* context)
</del><ins>+WebGLDepthTexture::WebGLDepthTexture(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -47,12 +47,12 @@
</span><span class="cx"> return WebGLDepthTextureName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLDepthTexture::supported(GraphicsContext3D* context)
</del><ins>+bool WebGLDepthTexture::supported(GraphicsContext3D& context)
</ins><span class="cx"> {
</span><del>- Extensions3D* extensions = context->getExtensions();
- return extensions->supports("GL_CHROMIUM_depth_texture")
- || extensions->supports("GL_OES_depth_texture")
- || extensions->supports("GL_ARB_depth_texture");
</del><ins>+ Extensions3D& extensions = context.getExtensions();
+ return extensions.supports("GL_CHROMIUM_depth_texture")
+ || extensions.supports("GL_OES_depth_texture")
+ || extensions.supports("GL_ARB_depth_texture");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDepthTextureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDepthTexture.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDepthTexture.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLDepthTexture.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx">
</span><span class="cx"> class WebGLDepthTexture final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit WebGLDepthTexture(WebGLRenderingContextBase*);
</del><ins>+ explicit WebGLDepthTexture(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~WebGLDepthTexture();
</span><span class="cx">
</span><del>- static bool supported(GraphicsContext3D*);
</del><ins>+ static bool supported(GraphicsContext3D&);
</ins><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDrawBufferscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLDrawBuffers::WebGLDrawBuffers(WebGLRenderingContextBase* context)
</del><ins>+WebGLDrawBuffers::WebGLDrawBuffers(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -46,51 +46,50 @@
</span><span class="cx"> return WebGLExtension::WebGLDrawBuffersName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WebGLDrawBuffers::supported(WebGLRenderingContextBase* context)
</del><ins>+bool WebGLDrawBuffers::supported(WebGLRenderingContextBase& context)
</ins><span class="cx"> {
</span><del>- Extensions3D* extensions = context->graphicsContext3D()->getExtensions();
- return extensions->supports("GL_EXT_draw_buffers")
</del><ins>+ return context.graphicsContext3D()->getExtensions().supports("GL_EXT_draw_buffers")
</ins><span class="cx"> && satisfiesWebGLRequirements(context);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebGLDrawBuffers::drawBuffersWEBGL(const Vector<GC3Denum>& buffers)
</span><span class="cx"> {
</span><del>- if (m_context->isContextLost())
</del><ins>+ if (m_context.isContextLost())
</ins><span class="cx"> return;
</span><span class="cx"> GC3Dsizei n = buffers.size();
</span><span class="cx"> const GC3Denum* bufs = buffers.data();
</span><del>- if (!m_context->m_framebufferBinding) {
</del><ins>+ if (!m_context.m_framebufferBinding) {
</ins><span class="cx"> if (n != 1) {
</span><del>- m_context->synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "drawBuffersWEBGL", "more than one buffer");
</del><ins>+ m_context.synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "drawBuffersWEBGL", "more than one buffer");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> if (bufs[0] != GraphicsContext3D::BACK && bufs[0] != GraphicsContext3D::NONE) {
</span><del>- m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "drawBuffersWEBGL", "BACK or NONE");
</del><ins>+ m_context.synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "drawBuffersWEBGL", "BACK or NONE");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> // Because the backbuffer is simulated on all current WebKit ports, we need to change BACK to COLOR_ATTACHMENT0.
</span><span class="cx"> GC3Denum value = (bufs[0] == GraphicsContext3D::BACK) ? GraphicsContext3D::COLOR_ATTACHMENT0 : GraphicsContext3D::NONE;
</span><del>- m_context->graphicsContext3D()->getExtensions()->drawBuffersEXT(1, &value);
- m_context->setBackDrawBuffer(bufs[0]);
</del><ins>+ m_context.graphicsContext3D()->getExtensions().drawBuffersEXT(1, &value);
+ m_context.setBackDrawBuffer(bufs[0]);
</ins><span class="cx"> } else {
</span><del>- if (n > m_context->getMaxDrawBuffers()) {
- m_context->synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "drawBuffersWEBGL", "more than max draw buffers");
</del><ins>+ if (n > m_context.getMaxDrawBuffers()) {
+ m_context.synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "drawBuffersWEBGL", "more than max draw buffers");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> for (GC3Dsizei i = 0; i < n; ++i) {
</span><span class="cx"> if (bufs[i] != GraphicsContext3D::NONE && bufs[i] != static_cast<GC3Denum>(Extensions3D::COLOR_ATTACHMENT0_EXT + i)) {
</span><del>- m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "drawBuffersWEBGL", "COLOR_ATTACHMENTi_EXT or NONE");
</del><ins>+ m_context.synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "drawBuffersWEBGL", "COLOR_ATTACHMENTi_EXT or NONE");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- m_context->m_framebufferBinding->drawBuffers(buffers);
</del><ins>+ m_context.m_framebufferBinding->drawBuffers(buffers);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // static
</span><del>-bool WebGLDrawBuffers::satisfiesWebGLRequirements(WebGLRenderingContextBase* webglContext)
</del><ins>+bool WebGLDrawBuffers::satisfiesWebGLRequirements(WebGLRenderingContextBase& webglContext)
</ins><span class="cx"> {
</span><del>- GraphicsContext3D* context = webglContext->graphicsContext3D();
</del><ins>+ GraphicsContext3D* context = webglContext.graphicsContext3D();
</ins><span class="cx">
</span><span class="cx"> // This is called after we make sure GL_EXT_draw_buffers is supported.
</span><span class="cx"> GC3Dint maxDrawBuffers = 0;
</span><span class="lines">@@ -104,11 +103,11 @@
</span><span class="cx"> context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, fbo);
</span><span class="cx">
</span><span class="cx"> const unsigned char buffer[4] = { 0, 0, 0, 0 }; // textures are required to be initialized for other ports.
</span><del>- bool supportsDepth = (context->getExtensions()->supports("GL_CHROMIUM_depth_texture")
- || context->getExtensions()->supports("GL_OES_depth_texture")
- || context->getExtensions()->supports("GL_ARB_depth_texture"));
- bool supportsDepthStencil = (context->getExtensions()->supports("GL_EXT_packed_depth_stencil")
- || context->getExtensions()->supports("GL_OES_packed_depth_stencil"));
</del><ins>+ bool supportsDepth = (context->getExtensions().supports("GL_CHROMIUM_depth_texture")
+ || context->getExtensions().supports("GL_OES_depth_texture")
+ || context->getExtensions().supports("GL_ARB_depth_texture"));
+ bool supportsDepthStencil = (context->getExtensions().supports("GL_EXT_packed_depth_stencil")
+ || context->getExtensions().supports("GL_OES_packed_depth_stencil"));
</ins><span class="cx"> Platform3DObject depthStencil = 0;
</span><span class="cx"> if (supportsDepthStencil) {
</span><span class="cx"> depthStencil = context->createTexture();
</span><span class="lines">@@ -155,9 +154,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- webglContext->restoreCurrentFramebuffer();
</del><ins>+ webglContext.restoreCurrentFramebuffer();
</ins><span class="cx"> context->deleteFramebuffer(fbo);
</span><del>- webglContext->restoreCurrentTexture2D();
</del><ins>+ webglContext.restoreCurrentTexture2D();
</ins><span class="cx"> if (supportsDepth)
</span><span class="cx"> context->deleteTexture(depth);
</span><span class="cx"> if (supportsDepthStencil)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLDrawBuffersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLDrawBuffers.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,10 +31,10 @@
</span><span class="cx">
</span><span class="cx"> class WebGLDrawBuffers final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit WebGLDrawBuffers(WebGLRenderingContextBase*);
</del><ins>+ explicit WebGLDrawBuffers(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~WebGLDrawBuffers();
</span><span class="cx">
</span><del>- static bool supported(WebGLRenderingContextBase*);
</del><ins>+ static bool supported(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span><span class="cx">
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> void drawBuffersWEBGL(const Vector<GC3Denum>& buffers);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static bool satisfiesWebGLRequirements(WebGLRenderingContextBase*);
</del><ins>+ static bool satisfiesWebGLRequirements(WebGLRenderingContextBase&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLExtensioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLExtension.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLExtension.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLExtension.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLExtension::WebGLExtension(WebGLRenderingContextBase* context)
</del><ins>+WebGLExtension::WebGLExtension(WebGLRenderingContextBase& context)
</ins><span class="cx"> : m_context(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLExtensionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLExtension.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLExtension.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLExtension.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -57,16 +57,16 @@
</span><span class="cx"> ANGLEInstancedArraysName,
</span><span class="cx"> };
</span><span class="cx">
</span><del>- void ref() { m_context->ref(); }
- void deref() { m_context->deref(); }
- WebGLRenderingContextBase* context() { return m_context; }
</del><ins>+ void ref() { m_context.ref(); }
+ void deref() { m_context.deref(); }
+ WebGLRenderingContextBase& context() { return m_context; }
</ins><span class="cx">
</span><span class="cx"> virtual ~WebGLExtension();
</span><span class="cx"> virtual ExtensionName getName() const = 0;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLExtension(WebGLRenderingContextBase*);
- WebGLRenderingContextBase* m_context;
</del><ins>+ WebGLExtension(WebGLRenderingContextBase&);
+ WebGLRenderingContextBase& m_context;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLFramebuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLFramebuffer.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -269,16 +269,16 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<WebGLFramebuffer> WebGLFramebuffer::create(WebGLRenderingContextBase* ctx)
</del><ins>+Ref<WebGLFramebuffer> WebGLFramebuffer::create(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLFramebuffer(ctx));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLFramebuffer::WebGLFramebuffer(WebGLRenderingContextBase* ctx)
</del><ins>+WebGLFramebuffer::WebGLFramebuffer(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> : WebGLContextObject(ctx)
</span><span class="cx"> , m_hasEverBeenBound(false)
</span><span class="cx"> {
</span><del>- setObject(ctx->graphicsContext3D()->createFramebuffer());
</del><ins>+ setObject(ctx.graphicsContext3D()->createFramebuffer());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLFramebuffer::~WebGLFramebuffer()
</span><span class="lines">@@ -627,7 +627,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (reset) {
</span><del>- context()->graphicsContext3D()->getExtensions()->drawBuffersEXT(
</del><ins>+ context()->graphicsContext3D()->getExtensions().drawBuffersEXT(
</ins><span class="cx"> m_filteredDrawBuffers.size(), m_filteredDrawBuffers.data());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLFramebufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLFramebuffer.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLFramebuffer.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLFramebuffer.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~WebGLFramebuffer();
</span><span class="cx">
</span><del>- static Ref<WebGLFramebuffer> create(WebGLRenderingContextBase*);
</del><ins>+ static Ref<WebGLFramebuffer> create(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void setAttachmentForBoundFramebuffer(GC3Denum attachment, GC3Denum texTarget, WebGLTexture*, GC3Dint level);
</span><span class="cx"> void setAttachmentForBoundFramebuffer(GC3Denum attachment, WebGLRenderbuffer*);
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> GC3Denum getDrawBuffer(GC3Denum);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLFramebuffer(WebGLRenderingContextBase*);
</del><ins>+ WebGLFramebuffer(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLLoseContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLLoseContext.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLLoseContext.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLLoseContext.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLLoseContext::WebGLLoseContext(WebGLRenderingContextBase* context)
</del><ins>+WebGLLoseContext::WebGLLoseContext(WebGLRenderingContextBase& context)
</ins><span class="cx"> : WebGLExtension(context)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -49,12 +49,12 @@
</span><span class="cx">
</span><span class="cx"> void WebGLLoseContext::loseContext()
</span><span class="cx"> {
</span><del>- m_context->forceLostContext(WebGLRenderingContextBase::SyntheticLostContext);
</del><ins>+ m_context.forceLostContext(WebGLRenderingContextBase::SyntheticLostContext);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebGLLoseContext::restoreContext()
</span><span class="cx"> {
</span><del>- m_context->forceRestoreContext();
</del><ins>+ m_context.forceRestoreContext();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLLoseContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLLoseContext.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLLoseContext.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLLoseContext.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> class WebGLLoseContext final : public WebGLExtension {
</span><span class="cx"> public:
</span><del>- explicit WebGLLoseContext(WebGLRenderingContextBase*);
</del><ins>+ explicit WebGLLoseContext(WebGLRenderingContextBase&);
</ins><span class="cx"> virtual ~WebGLLoseContext();
</span><span class="cx">
</span><span class="cx"> ExtensionName getName() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLObject.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLObject.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLObject.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLObject::WebGLObject(WebGLRenderingContextBase*)
</del><ins>+WebGLObject::WebGLObject(WebGLRenderingContextBase&)
</ins><span class="cx"> : m_object(0)
</span><span class="cx"> , m_attachmentCount(0)
</span><span class="cx"> , m_deleted(false)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLObject.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLObject.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLObject.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -54,10 +54,10 @@
</span><span class="cx"> bool isDeleted() { return m_deleted; }
</span><span class="cx">
</span><span class="cx"> // True if this object belongs to the group or context.
</span><del>- virtual bool validate(const WebGLContextGroup*, const WebGLRenderingContextBase*) const = 0;
</del><ins>+ virtual bool validate(const WebGLContextGroup*, const WebGLRenderingContextBase&) const = 0;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLObject(WebGLRenderingContextBase*);
</del><ins>+ WebGLObject(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> // setObject should be only called once right after creating a WebGLObject.
</span><span class="cx"> void setObject(Platform3DObject);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLProgramcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLProgram.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLProgram.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLProgram.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -34,18 +34,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLProgram> WebGLProgram::create(WebGLRenderingContextBase* ctx)
</del><ins>+Ref<WebGLProgram> WebGLProgram::create(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLProgram(ctx));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLProgram::WebGLProgram(WebGLRenderingContextBase* ctx)
</del><ins>+WebGLProgram::WebGLProgram(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> : WebGLSharedObject(ctx)
</span><span class="cx"> , m_linkStatus(false)
</span><span class="cx"> , m_linkCount(0)
</span><span class="cx"> , m_infoValid(true)
</span><span class="cx"> {
</span><del>- setObject(ctx->graphicsContext3D()->createProgram());
</del><ins>+ setObject(ctx.graphicsContext3D()->createProgram());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLProgram::~WebGLProgram()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLProgramh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLProgram.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLProgram.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLProgram.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebGLProgram();
</span><span class="cx">
</span><del>- static Ref<WebGLProgram> create(WebGLRenderingContextBase*);
</del><ins>+ static Ref<WebGLProgram> create(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> unsigned numActiveAttribLocations();
</span><span class="cx"> GC3Dint getActiveAttribLocation(GC3Duint index);
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> bool detachShader(WebGLShader*);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLProgram(WebGLRenderingContextBase*);
</del><ins>+ WebGLProgram(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLQuerycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLQuery.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLQuery.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLQuery.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLQuery> WebGLQuery::create(WebGLRenderingContextBase* ctx)
</del><ins>+Ref<WebGLQuery> WebGLQuery::create(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLQuery(ctx));
</span><span class="cx"> }
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> deleteObject(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLQuery::WebGLQuery(WebGLRenderingContextBase* ctx)
</del><ins>+WebGLQuery::WebGLQuery(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> : WebGLSharedObject(ctx)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Call createQuery from GraphicsContext3D.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLQueryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLQuery.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLQuery.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLQuery.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebGLQuery();
</span><span class="cx">
</span><del>- static Ref<WebGLQuery> create(WebGLRenderingContextBase*);
</del><ins>+ static Ref<WebGLQuery> create(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLQuery(WebGLRenderingContextBase*);
</del><ins>+ WebGLQuery(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderbuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderbuffer.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderbuffer.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderbuffer.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLRenderbuffer> WebGLRenderbuffer::create(WebGLRenderingContextBase* ctx)
</del><ins>+Ref<WebGLRenderbuffer> WebGLRenderbuffer::create(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLRenderbuffer(ctx));
</span><span class="cx"> }
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> deleteObject(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLRenderbuffer::WebGLRenderbuffer(WebGLRenderingContextBase* ctx)
</del><ins>+WebGLRenderbuffer::WebGLRenderbuffer(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> : WebGLSharedObject(ctx)
</span><span class="cx"> , m_internalFormat(GraphicsContext3D::RGBA4)
</span><span class="cx"> , m_initialized(false)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> , m_isValid(true)
</span><span class="cx"> , m_hasEverBeenBound(false)
</span><span class="cx"> {
</span><del>- setObject(ctx->graphicsContext3D()->createRenderbuffer());
</del><ins>+ setObject(ctx.graphicsContext3D()->createRenderbuffer());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebGLRenderbuffer::deleteObjectImpl(GraphicsContext3D* context3d, Platform3DObject object)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderbufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderbuffer.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderbuffer.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderbuffer.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebGLRenderbuffer();
</span><span class="cx">
</span><del>- static Ref<WebGLRenderbuffer> create(WebGLRenderingContextBase*);
</del><ins>+ static Ref<WebGLRenderbuffer> create(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void setInternalFormat(GC3Denum internalformat)
</span><span class="cx"> {
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> void setHasEverBeenBound() { m_hasEverBeenBound = true; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLRenderbuffer(WebGLRenderingContextBase*);
</del><ins>+ WebGLRenderbuffer(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> void WebGLRenderingContext::initializeVertexArrayObjects()
</span><span class="cx"> {
</span><del>- m_defaultVertexArrayObject = WebGLVertexArrayObjectOES::create(this, WebGLVertexArrayObjectOES::VAOTypeDefault);
</del><ins>+ m_defaultVertexArrayObject = WebGLVertexArrayObjectOES::create(*this, WebGLVertexArrayObjectOES::VAOTypeDefault);
</ins><span class="cx"> addContextObject(m_defaultVertexArrayObject.get());
</span><span class="cx"> m_boundVertexArrayObject = m_defaultVertexArrayObject;
</span><span class="cx"> if (!isGLES2Compliant())
</span><span class="lines">@@ -90,155 +90,155 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> if (equalIgnoringASCIICase(name, "EXT_blend_minmax")
</span><del>- && m_context->getExtensions()->supports("GL_EXT_blend_minmax")) {
</del><ins>+ && m_context->getExtensions().supports("GL_EXT_blend_minmax")) {
</ins><span class="cx"> if (!m_extBlendMinMax) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_EXT_blend_minmax");
- m_extBlendMinMax = std::make_unique<EXTBlendMinMax>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_EXT_blend_minmax");
+ m_extBlendMinMax = std::make_unique<EXTBlendMinMax>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_extBlendMinMax.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "EXT_sRGB")
</span><del>- && m_context->getExtensions()->supports("GL_EXT_sRGB")) {
</del><ins>+ && m_context->getExtensions().supports("GL_EXT_sRGB")) {
</ins><span class="cx"> if (!m_extsRGB) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_EXT_sRGB");
- m_extsRGB = std::make_unique<EXTsRGB>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_EXT_sRGB");
+ m_extsRGB = std::make_unique<EXTsRGB>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_extsRGB.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "EXT_frag_depth")
</span><del>- && m_context->getExtensions()->supports("GL_EXT_frag_depth")) {
</del><ins>+ && m_context->getExtensions().supports("GL_EXT_frag_depth")) {
</ins><span class="cx"> if (!m_extFragDepth) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_EXT_frag_depth");
- m_extFragDepth = std::make_unique<EXTFragDepth>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_EXT_frag_depth");
+ m_extFragDepth = std::make_unique<EXTFragDepth>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_extFragDepth.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "EXT_shader_texture_lod")
</span><del>- && (m_context->getExtensions()->supports("GL_EXT_shader_texture_lod") || m_context->getExtensions()->supports("GL_ARB_shader_texture_lod"))) {
</del><ins>+ && (m_context->getExtensions().supports("GL_EXT_shader_texture_lod") || m_context->getExtensions().supports("GL_ARB_shader_texture_lod"))) {
</ins><span class="cx"> if (!m_extShaderTextureLOD) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_EXT_shader_texture_lod");
- m_extShaderTextureLOD = std::make_unique<EXTShaderTextureLOD>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_EXT_shader_texture_lod");
+ m_extShaderTextureLOD = std::make_unique<EXTShaderTextureLOD>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_extShaderTextureLOD.get();
</span><span class="cx"> }
</span><span class="cx"> if ((equalIgnoringASCIICase(name, "EXT_texture_filter_anisotropic") || equalIgnoringASCIICase(name, "WEBKIT_EXT_texture_filter_anisotropic"))
</span><del>- && m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic")) {
</del><ins>+ && m_context->getExtensions().supports("GL_EXT_texture_filter_anisotropic")) {
</ins><span class="cx"> if (!m_extTextureFilterAnisotropic) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_EXT_texture_filter_anisotropic");
- m_extTextureFilterAnisotropic = std::make_unique<EXTTextureFilterAnisotropic>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_EXT_texture_filter_anisotropic");
+ m_extTextureFilterAnisotropic = std::make_unique<EXTTextureFilterAnisotropic>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_extTextureFilterAnisotropic.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_standard_derivatives")
</span><del>- && m_context->getExtensions()->supports("GL_OES_standard_derivatives")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_standard_derivatives")) {
</ins><span class="cx"> if (!m_oesStandardDerivatives) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_standard_derivatives");
- m_oesStandardDerivatives = std::make_unique<OESStandardDerivatives>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_standard_derivatives");
+ m_oesStandardDerivatives = std::make_unique<OESStandardDerivatives>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_oesStandardDerivatives.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_texture_float")
</span><del>- && m_context->getExtensions()->supports("GL_OES_texture_float")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_texture_float")) {
</ins><span class="cx"> if (!m_oesTextureFloat) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_texture_float");
- m_oesTextureFloat = std::make_unique<OESTextureFloat>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_texture_float");
+ m_oesTextureFloat = std::make_unique<OESTextureFloat>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_oesTextureFloat.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_texture_float_linear")
</span><del>- && m_context->getExtensions()->supports("GL_OES_texture_float_linear")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_texture_float_linear")) {
</ins><span class="cx"> if (!m_oesTextureFloatLinear) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_texture_float_linear");
- m_oesTextureFloatLinear = std::make_unique<OESTextureFloatLinear>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_texture_float_linear");
+ m_oesTextureFloatLinear = std::make_unique<OESTextureFloatLinear>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_oesTextureFloatLinear.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_texture_half_float")
</span><del>- && m_context->getExtensions()->supports("GL_OES_texture_half_float")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_texture_half_float")) {
</ins><span class="cx"> if (!m_oesTextureHalfFloat) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_texture_half_float");
- m_oesTextureHalfFloat = std::make_unique<OESTextureHalfFloat>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_texture_half_float");
+ m_oesTextureHalfFloat = std::make_unique<OESTextureHalfFloat>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_oesTextureHalfFloat.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_texture_half_float_linear")
</span><del>- && m_context->getExtensions()->supports("GL_OES_texture_half_float_linear")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_texture_half_float_linear")) {
</ins><span class="cx"> if (!m_oesTextureHalfFloatLinear) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_texture_half_float_linear");
- m_oesTextureHalfFloatLinear = std::make_unique<OESTextureHalfFloatLinear>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_texture_half_float_linear");
+ m_oesTextureHalfFloatLinear = std::make_unique<OESTextureHalfFloatLinear>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_oesTextureHalfFloatLinear.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_vertex_array_object")
</span><del>- && m_context->getExtensions()->supports("GL_OES_vertex_array_object")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_vertex_array_object")) {
</ins><span class="cx"> if (!m_oesVertexArrayObject) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_vertex_array_object");
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_vertex_array_object");
</ins><span class="cx"> m_oesVertexArrayObject = std::make_unique<OESVertexArrayObject>(*this);
</span><span class="cx"> }
</span><span class="cx"> return m_oesVertexArrayObject.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "OES_element_index_uint")
</span><del>- && m_context->getExtensions()->supports("GL_OES_element_index_uint")) {
</del><ins>+ && m_context->getExtensions().supports("GL_OES_element_index_uint")) {
</ins><span class="cx"> if (!m_oesElementIndexUint) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_OES_element_index_uint");
- m_oesElementIndexUint = std::make_unique<OESElementIndexUint>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_OES_element_index_uint");
+ m_oesElementIndexUint = std::make_unique<OESElementIndexUint>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_oesElementIndexUint.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_lose_context")) {
</span><span class="cx"> if (!m_webglLoseContext)
</span><del>- m_webglLoseContext = std::make_unique<WebGLLoseContext>(this);
</del><ins>+ m_webglLoseContext = std::make_unique<WebGLLoseContext>(*this);
</ins><span class="cx"> return m_webglLoseContext.get();
</span><span class="cx"> }
</span><span class="cx"> if ((equalIgnoringASCIICase(name, "WEBKIT_WEBGL_compressed_texture_atc"))
</span><del>- && WebGLCompressedTextureATC::supported(this)) {
</del><ins>+ && WebGLCompressedTextureATC::supported(*this)) {
</ins><span class="cx"> if (!m_webglCompressedTextureATC)
</span><del>- m_webglCompressedTextureATC = std::make_unique<WebGLCompressedTextureATC>(this);
</del><ins>+ m_webglCompressedTextureATC = std::make_unique<WebGLCompressedTextureATC>(*this);
</ins><span class="cx"> return m_webglCompressedTextureATC.get();
</span><span class="cx"> }
</span><span class="cx"> if ((equalIgnoringASCIICase(name, "WEBKIT_WEBGL_compressed_texture_pvrtc"))
</span><del>- && WebGLCompressedTexturePVRTC::supported(this)) {
</del><ins>+ && WebGLCompressedTexturePVRTC::supported(*this)) {
</ins><span class="cx"> if (!m_webglCompressedTexturePVRTC)
</span><del>- m_webglCompressedTexturePVRTC = std::make_unique<WebGLCompressedTexturePVRTC>(this);
</del><ins>+ m_webglCompressedTexturePVRTC = std::make_unique<WebGLCompressedTexturePVRTC>(*this);
</ins><span class="cx"> return m_webglCompressedTexturePVRTC.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_compressed_texture_s3tc")
</span><del>- && WebGLCompressedTextureS3TC::supported(this)) {
</del><ins>+ && WebGLCompressedTextureS3TC::supported(*this)) {
</ins><span class="cx"> if (!m_webglCompressedTextureS3TC)
</span><del>- m_webglCompressedTextureS3TC = std::make_unique<WebGLCompressedTextureS3TC>(this);
</del><ins>+ m_webglCompressedTextureS3TC = std::make_unique<WebGLCompressedTextureS3TC>(*this);
</ins><span class="cx"> return m_webglCompressedTextureS3TC.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_depth_texture")
</span><del>- && WebGLDepthTexture::supported(graphicsContext3D())) {
</del><ins>+ && WebGLDepthTexture::supported(*graphicsContext3D())) {
</ins><span class="cx"> if (!m_webglDepthTexture) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_CHROMIUM_depth_texture");
- m_webglDepthTexture = std::make_unique<WebGLDepthTexture>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_CHROMIUM_depth_texture");
+ m_webglDepthTexture = std::make_unique<WebGLDepthTexture>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_webglDepthTexture.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_draw_buffers") && supportsDrawBuffers()) {
</span><span class="cx"> if (!m_webglDrawBuffers) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_EXT_draw_buffers");
- m_webglDrawBuffers = std::make_unique<WebGLDrawBuffers>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_EXT_draw_buffers");
+ m_webglDrawBuffers = std::make_unique<WebGLDrawBuffers>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_webglDrawBuffers.get();
</span><span class="cx"> }
</span><del>- if (equalIgnoringASCIICase(name, "ANGLE_instanced_arrays") && ANGLEInstancedArrays::supported(this)) {
</del><ins>+ if (equalIgnoringASCIICase(name, "ANGLE_instanced_arrays") && ANGLEInstancedArrays::supported(*this)) {
</ins><span class="cx"> if (!m_angleInstancedArrays) {
</span><del>- m_context->getExtensions()->ensureEnabled("GL_ANGLE_instanced_arrays");
- m_angleInstancedArrays = std::make_unique<ANGLEInstancedArrays>(this);
</del><ins>+ m_context->getExtensions().ensureEnabled("GL_ANGLE_instanced_arrays");
+ m_angleInstancedArrays = std::make_unique<ANGLEInstancedArrays>(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_angleInstancedArrays.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_debug_renderer_info")) {
</span><span class="cx"> if (!m_webglDebugRendererInfo)
</span><del>- m_webglDebugRendererInfo = std::make_unique<WebGLDebugRendererInfo>(this);
</del><ins>+ m_webglDebugRendererInfo = std::make_unique<WebGLDebugRendererInfo>(*this);
</ins><span class="cx"> return m_webglDebugRendererInfo.get();
</span><span class="cx"> }
</span><span class="cx"> if (equalIgnoringASCIICase(name, "WEBGL_debug_shaders")
</span><del>- && m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source")) {
</del><ins>+ && m_context->getExtensions().supports("GL_ANGLE_translated_shader_source")) {
</ins><span class="cx"> if (!m_webglDebugShaders)
</span><del>- m_webglDebugShaders = std::make_unique<WebGLDebugShaders>(this);
</del><ins>+ m_webglDebugShaders = std::make_unique<WebGLDebugShaders>(*this);
</ins><span class="cx"> return m_webglDebugShaders.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -252,44 +252,44 @@
</span><span class="cx"> if (m_isPendingPolicyResolution)
</span><span class="cx"> return result;
</span><span class="cx">
</span><del>- if (m_context->getExtensions()->supports("GL_EXT_blend_minmax"))
</del><ins>+ if (m_context->getExtensions().supports("GL_EXT_blend_minmax"))
</ins><span class="cx"> result.append("EXT_blend_minmax");
</span><del>- if (m_context->getExtensions()->supports("GL_EXT_sRGB"))
</del><ins>+ if (m_context->getExtensions().supports("GL_EXT_sRGB"))
</ins><span class="cx"> result.append("EXT_sRGB");
</span><del>- if (m_context->getExtensions()->supports("GL_EXT_frag_depth"))
</del><ins>+ if (m_context->getExtensions().supports("GL_EXT_frag_depth"))
</ins><span class="cx"> result.append("EXT_frag_depth");
</span><del>- if (m_context->getExtensions()->supports("GL_OES_texture_float"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_texture_float"))
</ins><span class="cx"> result.append("OES_texture_float");
</span><del>- if (m_context->getExtensions()->supports("GL_OES_texture_float_linear"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_texture_float_linear"))
</ins><span class="cx"> result.append("OES_texture_float_linear");
</span><del>- if (m_context->getExtensions()->supports("GL_OES_texture_half_float"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_texture_half_float"))
</ins><span class="cx"> result.append("OES_texture_half_float");
</span><del>- if (m_context->getExtensions()->supports("GL_OES_texture_half_float_linear"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_texture_half_float_linear"))
</ins><span class="cx"> result.append("OES_texture_half_float_linear");
</span><del>- if (m_context->getExtensions()->supports("GL_OES_standard_derivatives"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_standard_derivatives"))
</ins><span class="cx"> result.append("OES_standard_derivatives");
</span><del>- if (m_context->getExtensions()->supports("GL_EXT_shader_texture_lod") || m_context->getExtensions()->supports("GL_ARB_shader_texture_lod"))
</del><ins>+ if (m_context->getExtensions().supports("GL_EXT_shader_texture_lod") || m_context->getExtensions().supports("GL_ARB_shader_texture_lod"))
</ins><span class="cx"> result.append("EXT_shader_texture_lod");
</span><del>- if (m_context->getExtensions()->supports("GL_EXT_texture_filter_anisotropic"))
</del><ins>+ if (m_context->getExtensions().supports("GL_EXT_texture_filter_anisotropic"))
</ins><span class="cx"> result.append("EXT_texture_filter_anisotropic");
</span><del>- if (m_context->getExtensions()->supports("GL_OES_vertex_array_object"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_vertex_array_object"))
</ins><span class="cx"> result.append("OES_vertex_array_object");
</span><del>- if (m_context->getExtensions()->supports("GL_OES_element_index_uint"))
</del><ins>+ if (m_context->getExtensions().supports("GL_OES_element_index_uint"))
</ins><span class="cx"> result.append("OES_element_index_uint");
</span><span class="cx"> result.append("WEBGL_lose_context");
</span><del>- if (WebGLCompressedTextureATC::supported(this))
</del><ins>+ if (WebGLCompressedTextureATC::supported(*this))
</ins><span class="cx"> result.append("WEBKIT_WEBGL_compressed_texture_atc");
</span><del>- if (WebGLCompressedTexturePVRTC::supported(this))
</del><ins>+ if (WebGLCompressedTexturePVRTC::supported(*this))
</ins><span class="cx"> result.append("WEBKIT_WEBGL_compressed_texture_pvrtc");
</span><del>- if (WebGLCompressedTextureS3TC::supported(this))
</del><ins>+ if (WebGLCompressedTextureS3TC::supported(*this))
</ins><span class="cx"> result.append("WEBGL_compressed_texture_s3tc");
</span><del>- if (WebGLDepthTexture::supported(graphicsContext3D()))
</del><ins>+ if (WebGLDepthTexture::supported(*graphicsContext3D()))
</ins><span class="cx"> result.append("WEBGL_depth_texture");
</span><span class="cx"> if (supportsDrawBuffers())
</span><span class="cx"> result.append("WEBGL_draw_buffers");
</span><del>- if (ANGLEInstancedArrays::supported(this))
</del><ins>+ if (ANGLEInstancedArrays::supported(*this))
</ins><span class="cx"> result.append("ANGLE_instanced_arrays");
</span><del>- if (m_context->getExtensions()->supports("GL_ANGLE_translated_shader_source"))
</del><ins>+ if (m_context->getExtensions().supports("GL_ANGLE_translated_shader_source"))
</ins><span class="cx"> result.append("WEBGL_debug_shaders");
</span><span class="cx"> result.append("WEBGL_debug_renderer_info");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLRenderingContextBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -430,9 +430,9 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Extensions3D* extensions = context->getExtensions();
- if (extensions->supports("GL_EXT_debug_marker"))
- extensions->pushGroupMarkerEXT("WebGLRenderingContext");
</del><ins>+ Extensions3D& extensions = context->getExtensions();
+ if (extensions.supports("GL_EXT_debug_marker"))
+ extensions.pushGroupMarkerEXT("WebGLRenderingContext");
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<WebGLRenderingContextBase> renderingContext = nullptr;
</span><span class="cx"> #if ENABLE(WEBGL2)
</span><span class="lines">@@ -575,16 +575,16 @@
</span><span class="cx"> m_synthesizedErrorsToConsole = page->settings().webGLErrorsToConsoleEnabled();
</span><span class="cx">
</span><span class="cx"> m_isGLES2Compliant = m_context->isGLES2Compliant();
</span><del>- m_isErrorGeneratedOnOutOfBoundsAccesses = m_context->getExtensions()->isEnabled("GL_CHROMIUM_strict_attribs");
- m_isResourceSafe = m_context->getExtensions()->isEnabled("GL_CHROMIUM_resource_safe");
</del><ins>+ m_isErrorGeneratedOnOutOfBoundsAccesses = m_context->getExtensions().isEnabled("GL_CHROMIUM_strict_attribs");
+ m_isResourceSafe = m_context->getExtensions().isEnabled("GL_CHROMIUM_resource_safe");
</ins><span class="cx"> if (m_isGLES2Compliant) {
</span><del>- m_isGLES2NPOTStrict = !m_context->getExtensions()->isEnabled("GL_OES_texture_npot");
- m_isDepthStencilSupported = m_context->getExtensions()->isEnabled("GL_OES_packed_depth_stencil");
</del><ins>+ m_isGLES2NPOTStrict = !m_context->getExtensions().isEnabled("GL_OES_texture_npot");
+ m_isDepthStencilSupported = m_context->getExtensions().isEnabled("GL_OES_packed_depth_stencil");
</ins><span class="cx"> } else {
</span><del>- m_isGLES2NPOTStrict = !m_context->getExtensions()->isEnabled("GL_ARB_texture_non_power_of_two");
- m_isDepthStencilSupported = m_context->getExtensions()->isEnabled("GL_EXT_packed_depth_stencil");
</del><ins>+ m_isGLES2NPOTStrict = !m_context->getExtensions().isEnabled("GL_ARB_texture_non_power_of_two");
+ m_isDepthStencilSupported = m_context->getExtensions().isEnabled("GL_EXT_packed_depth_stencil");
</ins><span class="cx"> }
</span><del>- m_isRobustnessEXTSupported = m_context->getExtensions()->isEnabled("GL_EXT_robustness");
</del><ins>+ m_isRobustnessEXTSupported = m_context->getExtensions().isEnabled("GL_EXT_robustness");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebGLRenderingContextBase::addCompressedTextureFormat(GC3Denum format)
</span><span class="lines">@@ -894,7 +894,7 @@
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return false;
</span><span class="cx"> if (object) {
</span><del>- if (!object->validate(contextGroup(), this)) {
</del><ins>+ if (!object->validate(contextGroup(), *this)) {
</ins><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "object not from this context");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1400,7 +1400,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return nullptr;
</span><del>- auto buffer = WebGLBuffer::create(this);
</del><ins>+ auto buffer = WebGLBuffer::create(*this);
</ins><span class="cx"> addSharedObject(buffer.ptr());
</span><span class="cx"> return WTFMove(buffer);
</span><span class="cx"> }
</span><span class="lines">@@ -1409,7 +1409,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return nullptr;
</span><del>- auto buffer = WebGLFramebuffer::create(this);
</del><ins>+ auto buffer = WebGLFramebuffer::create(*this);
</ins><span class="cx"> addContextObject(buffer.ptr());
</span><span class="cx"> return WTFMove(buffer);
</span><span class="cx"> }
</span><span class="lines">@@ -1418,7 +1418,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return nullptr;
</span><del>- auto texture = WebGLTexture::create(this);
</del><ins>+ auto texture = WebGLTexture::create(*this);
</ins><span class="cx"> addSharedObject(texture.ptr());
</span><span class="cx"> return WTFMove(texture);
</span><span class="cx"> }
</span><span class="lines">@@ -1427,7 +1427,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return nullptr;
</span><del>- auto program = WebGLProgram::create(this);
</del><ins>+ auto program = WebGLProgram::create(*this);
</ins><span class="cx"> addSharedObject(program.ptr());
</span><span class="cx"> return WTFMove(program);
</span><span class="cx"> }
</span><span class="lines">@@ -1436,7 +1436,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending())
</span><span class="cx"> return nullptr;
</span><del>- auto buffer = WebGLRenderbuffer::create(this);
</del><ins>+ auto buffer = WebGLRenderbuffer::create(*this);
</ins><span class="cx"> addSharedObject(buffer.ptr());
</span><span class="cx"> return WTFMove(buffer);
</span><span class="cx"> }
</span><span class="lines">@@ -1450,7 +1450,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto shader = WebGLShader::create(this, type);
</del><ins>+ auto shader = WebGLShader::create(*this, type);
</ins><span class="cx"> addSharedObject(shader.ptr());
</span><span class="cx"> return WTFMove(shader);
</span><span class="cx"> }
</span><span class="lines">@@ -1466,7 +1466,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isContextLostOrPending() || !object)
</span><span class="cx"> return false;
</span><del>- if (!object->validate(contextGroup(), this)) {
</del><ins>+ if (!object->validate(contextGroup(), *this)) {
</ins><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "delete", "object does not belong to this context");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1788,7 +1788,7 @@
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_VALUE, functionName, "no object or object deleted");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- if (!object->validate(contextGroup(), this)) {
</del><ins>+ if (!object->validate(contextGroup(), *this)) {
</ins><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "object does not belong to this context");
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -2036,7 +2036,7 @@
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_ENUM, "framebufferRenderbuffer", "invalid target");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (buffer && !buffer->validate(contextGroup(), this)) {
</del><ins>+ if (buffer && !buffer->validate(contextGroup(), *this)) {
</ins><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "framebufferRenderbuffer", "no buffer or buffer not from this context");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2068,7 +2068,7 @@
</span><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_VALUE, "framebufferTexture2D", "level not 0");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (texture && !texture->validate(contextGroup(), this)) {
</del><ins>+ if (texture && !texture->validate(contextGroup(), *this)) {
</ins><span class="cx"> synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, "framebufferTexture2D", "no texture or texture not from this context");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2547,7 +2547,7 @@
</span><span class="cx"> case GraphicsContext3D::FLOAT: {
</span><span class="cx"> GC3Dfloat value[16] = {0};
</span><span class="cx"> if (m_isRobustnessEXTSupported)
</span><del>- m_context->getExtensions()->getnUniformfvEXT(objectOrZero(program), location, 16 * sizeof(GC3Dfloat), value);
</del><ins>+ m_context->getExtensions().getnUniformfvEXT(objectOrZero(program), location, 16 * sizeof(GC3Dfloat), value);
</ins><span class="cx"> else
</span><span class="cx"> m_context->getUniformfv(objectOrZero(program), location, value);
</span><span class="cx"> if (length == 1)
</span><span class="lines">@@ -2557,7 +2557,7 @@
</span><span class="cx"> case GraphicsContext3D::INT: {
</span><span class="cx"> GC3Dint value[4] = {0};
</span><span class="cx"> if (m_isRobustnessEXTSupported)
</span><del>- m_context->getExtensions()->getnUniformivEXT(objectOrZero(program), location, 4 * sizeof(GC3Dint), value);
</del><ins>+ m_context->getExtensions().getnUniformivEXT(objectOrZero(program), location, 4 * sizeof(GC3Dint), value);
</ins><span class="cx"> else
</span><span class="cx"> m_context->getUniformiv(objectOrZero(program), location, value);
</span><span class="cx"> if (length == 1)
</span><span class="lines">@@ -2567,7 +2567,7 @@
</span><span class="cx"> case GraphicsContext3D::BOOL: {
</span><span class="cx"> GC3Dint value[4] = {0};
</span><span class="cx"> if (m_isRobustnessEXTSupported)
</span><del>- m_context->getExtensions()->getnUniformivEXT(objectOrZero(program), location, 4 * sizeof(GC3Dint), value);
</del><ins>+ m_context->getExtensions().getnUniformivEXT(objectOrZero(program), location, 4 * sizeof(GC3Dint), value);
</ins><span class="cx"> else
</span><span class="cx"> m_context->getUniformiv(objectOrZero(program), location, value);
</span><span class="cx"> if (length > 1) {
</span><span class="lines">@@ -3150,7 +3150,7 @@
</span><span class="cx"> void* data = pixels.baseAddress();
</span><span class="cx">
</span><span class="cx"> if (m_isRobustnessEXTSupported)
</span><del>- m_context->getExtensions()->readnPixelsEXT(x, y, width, height, format, type, pixels.byteLength(), data);
</del><ins>+ m_context->getExtensions().readnPixelsEXT(x, y, width, height, format, type, pixels.byteLength(), data);
</ins><span class="cx"> else
</span><span class="cx"> m_context->readPixels(x, y, width, height, format, type, data);
</span><span class="cx"> }
</span><span class="lines">@@ -4660,7 +4660,7 @@
</span><span class="cx"> // Inform the embedder that a lost context was received. In response, the embedder might
</span><span class="cx"> // decide to take action such as asking the user for permission to use WebGL again.
</span><span class="cx"> if (Frame* frame = canvas().document().frame())
</span><del>- frame->loader().client().didLoseWebGLContext(m_context->getExtensions()->getGraphicsResetStatusARB());
</del><ins>+ frame->loader().client().didLoseWebGLContext(m_context->getExtensions().getGraphicsResetStatusARB());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> detachAndRemoveAllObjects();
</span><span class="lines">@@ -5648,7 +5648,7 @@
</span><span class="cx"> if (!m_restoreAllowed)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- int contextLostReason = m_context->getExtensions()->getGraphicsResetStatusARB();
</del><ins>+ int contextLostReason = m_context->getExtensions().getGraphicsResetStatusARB();
</ins><span class="cx">
</span><span class="cx"> switch (contextLostReason) {
</span><span class="cx"> case GraphicsContext3D::NO_ERROR:
</span><span class="lines">@@ -5867,7 +5867,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_drawBuffersWebGLRequirementsChecked) {
</span><span class="cx"> m_drawBuffersWebGLRequirementsChecked = true;
</span><del>- m_drawBuffersSupported = WebGLDrawBuffers::supported(this);
</del><ins>+ m_drawBuffersSupported = WebGLDrawBuffers::supported(*this);
</ins><span class="cx"> }
</span><span class="cx"> return m_drawBuffersSupported;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLSamplercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLSampler.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLSampler.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLSampler.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLSampler> WebGLSampler::create(WebGLRenderingContextBase* ctx)
</del><ins>+Ref<WebGLSampler> WebGLSampler::create(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLSampler(ctx));
</span><span class="cx"> }
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> deleteObject(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLSampler::WebGLSampler(WebGLRenderingContextBase* ctx)
</del><ins>+WebGLSampler::WebGLSampler(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> : WebGLSharedObject(ctx)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Call createSampler from GraphicsContext3D.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLSamplerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLSampler.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLSampler.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLSampler.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebGLSampler();
</span><span class="cx">
</span><del>- static Ref<WebGLSampler> create(WebGLRenderingContextBase*);
</del><ins>+ static Ref<WebGLSampler> create(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLSampler(WebGLRenderingContextBase*);
</del><ins>+ WebGLSampler(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLShadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLShader.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLShader.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLShader.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -34,18 +34,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLShader> WebGLShader::create(WebGLRenderingContextBase* ctx, GC3Denum type)
</del><ins>+Ref<WebGLShader> WebGLShader::create(WebGLRenderingContextBase& ctx, GC3Denum type)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLShader(ctx, type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLShader::WebGLShader(WebGLRenderingContextBase* ctx, GC3Denum type)
</del><ins>+WebGLShader::WebGLShader(WebGLRenderingContextBase& ctx, GC3Denum type)
</ins><span class="cx"> : WebGLSharedObject(ctx)
</span><span class="cx"> , m_type(type)
</span><span class="cx"> , m_source(emptyString())
</span><span class="cx"> , m_isValid(false)
</span><span class="cx"> {
</span><del>- setObject(ctx->graphicsContext3D()->createShader(type));
</del><ins>+ setObject(ctx.graphicsContext3D()->createShader(type));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLShader::~WebGLShader()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLShaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLShader.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLShader.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLShader.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebGLShader();
</span><span class="cx">
</span><del>- static Ref<WebGLShader> create(WebGLRenderingContextBase*, GC3Denum);
</del><ins>+ static Ref<WebGLShader> create(WebGLRenderingContextBase&, GC3Denum);
</ins><span class="cx">
</span><span class="cx"> GC3Denum getType() const { return m_type; }
</span><span class="cx"> const String& getSource() const { return m_source; }
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> void setValid(bool valid) { m_isValid = valid; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebGLShader(WebGLRenderingContextBase*, GC3Denum);
</del><ins>+ WebGLShader(WebGLRenderingContextBase&, GC3Denum);
</ins><span class="cx">
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLSharedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLSharedObject.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLSharedObject.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLSharedObject.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLSharedObject::WebGLSharedObject(WebGLRenderingContextBase* context)
- : WebGLObject(context),
- m_contextGroup(context->contextGroup())
</del><ins>+WebGLSharedObject::WebGLSharedObject(WebGLRenderingContextBase& context)
+ : WebGLObject(context)
+ , m_contextGroup(context.contextGroup())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLSharedObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLSharedObject.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLSharedObject.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLSharedObject.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> virtual bool isTransformFeedback() const { return false; }
</span><span class="cx"> virtual bool isVertexArrayObject() const { return false; }
</span><span class="cx">
</span><del>- bool validate(const WebGLContextGroup* contextGroup, const WebGLRenderingContextBase*) const override
</del><ins>+ bool validate(const WebGLContextGroup* contextGroup, const WebGLRenderingContextBase&) const override
</ins><span class="cx"> {
</span><span class="cx"> return contextGroup == m_contextGroup;
</span><span class="cx"> }
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> void detachContextGroup();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLSharedObject(WebGLRenderingContextBase*);
</del><ins>+ WebGLSharedObject(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> bool hasGroupOrContext() const override
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLSync.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLSync.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLSync.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLSync> WebGLSync::create(WebGLRenderingContextBase* ctx)
</del><ins>+Ref<WebGLSync> WebGLSync::create(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLSync(ctx));
</span><span class="cx"> }
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> deleteObject(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLSync::WebGLSync(WebGLRenderingContextBase* ctx)
</del><ins>+WebGLSync::WebGLSync(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> : WebGLSharedObject(ctx)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Call fenceSync from GraphicsContext3D.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLSynch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLSync.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLSync.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLSync.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebGLSync();
</span><span class="cx">
</span><del>- static Ref<WebGLSync> create(WebGLRenderingContextBase*);
</del><ins>+ static Ref<WebGLSync> create(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLSync(WebGLRenderingContextBase*);
</del><ins>+ WebGLSync(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLTexturecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLTexture.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLTexture.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLTexture.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -35,12 +35,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLTexture> WebGLTexture::create(WebGLRenderingContextBase* ctx)
</del><ins>+Ref<WebGLTexture> WebGLTexture::create(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLTexture(ctx));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLTexture::WebGLTexture(WebGLRenderingContextBase* ctx)
</del><ins>+WebGLTexture::WebGLTexture(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> : WebGLSharedObject(ctx)
</span><span class="cx"> , m_target(0)
</span><span class="cx"> , m_minFilter(GraphicsContext3D::NEAREST_MIPMAP_LINEAR)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> , m_isFloatType(false)
</span><span class="cx"> , m_isHalfFloatType(false)
</span><span class="cx"> {
</span><del>- setObject(ctx->graphicsContext3D()->createTexture());
</del><ins>+ setObject(ctx.graphicsContext3D()->createTexture());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebGLTexture::~WebGLTexture()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLTextureh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLTexture.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLTexture.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLTexture.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~WebGLTexture();
</span><span class="cx">
</span><del>- static Ref<WebGLTexture> create(WebGLRenderingContextBase*);
</del><ins>+ static Ref<WebGLTexture> create(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void setTarget(GC3Denum target, GC3Dint maxLevel);
</span><span class="cx"> void setParameteri(GC3Denum pname, GC3Dint param);
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> static GC3Dint computeLevelCount(GC3Dsizei width, GC3Dsizei height);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebGLTexture(WebGLRenderingContextBase*);
</del><ins>+ WebGLTexture(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLTransformFeedbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLTransformFeedback.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLTransformFeedback.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLTransformFeedback.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLTransformFeedback> WebGLTransformFeedback::create(WebGLRenderingContextBase* ctx)
</del><ins>+Ref<WebGLTransformFeedback> WebGLTransformFeedback::create(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLTransformFeedback(ctx));
</span><span class="cx"> }
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> deleteObject(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLTransformFeedback::WebGLTransformFeedback(WebGLRenderingContextBase* ctx)
</del><ins>+WebGLTransformFeedback::WebGLTransformFeedback(WebGLRenderingContextBase& ctx)
</ins><span class="cx"> : WebGLSharedObject(ctx)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Call createTransformFeedback from GraphicsContext3D.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLTransformFeedbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLTransformFeedback.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLTransformFeedback.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLTransformFeedback.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebGLTransformFeedback();
</span><span class="cx">
</span><del>- static Ref<WebGLTransformFeedback> create(WebGLRenderingContextBase*);
</del><ins>+ static Ref<WebGLTransformFeedback> create(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLTransformFeedback(WebGLRenderingContextBase*);
</del><ins>+ WebGLTransformFeedback(WebGLRenderingContextBase&);
</ins><span class="cx">
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLVertexArrayObject> WebGLVertexArrayObject::create(WebGLRenderingContextBase* ctx, VAOType type)
</del><ins>+Ref<WebGLVertexArrayObject> WebGLVertexArrayObject::create(WebGLRenderingContextBase& ctx, VAOType type)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLVertexArrayObject(ctx, type));
</span><span class="cx"> }
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> deleteObject(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLVertexArrayObject::WebGLVertexArrayObject(WebGLRenderingContextBase* ctx, VAOType type)
</del><ins>+WebGLVertexArrayObject::WebGLVertexArrayObject(WebGLRenderingContextBase& ctx, VAOType type)
</ins><span class="cx"> : WebGLVertexArrayObjectBase(ctx, type)
</span><span class="cx"> {
</span><span class="cx"> switch (m_type) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLVertexArrayObject.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx">
</span><span class="cx"> class WebGLVertexArrayObject final : public WebGLVertexArrayObjectBase {
</span><span class="cx"> public:
</span><del>- static Ref<WebGLVertexArrayObject> create(WebGLRenderingContextBase*, VAOType);
</del><ins>+ static Ref<WebGLVertexArrayObject> create(WebGLRenderingContextBase&, VAOType);
</ins><span class="cx"> virtual ~WebGLVertexArrayObject();
</span><span class="cx"> private:
</span><del>- WebGLVertexArrayObject(WebGLRenderingContextBase*, VAOType);
</del><ins>+ WebGLVertexArrayObject(WebGLRenderingContextBase&, VAOType);
</ins><span class="cx"> bool isTransformFeedback() const { return true; }
</span><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectBase.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectBase.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectBase.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -32,13 +32,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebGLVertexArrayObjectBase::WebGLVertexArrayObjectBase(WebGLRenderingContextBase* ctx, VAOType type)
</del><ins>+WebGLVertexArrayObjectBase::WebGLVertexArrayObjectBase(WebGLRenderingContextBase& ctx, VAOType type)
</ins><span class="cx"> : WebGLContextObject(ctx)
</span><span class="cx"> , m_type(type)
</span><span class="cx"> , m_hasEverBeenBound(false)
</span><span class="cx"> , m_boundElementArrayBuffer(0)
</span><span class="cx"> {
</span><del>- m_vertexAttribState.resize(ctx->getMaxVertexAttribs());
</del><ins>+ m_vertexAttribState.resize(ctx.getMaxVertexAttribs());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebGLVertexArrayObjectBase::setElementArrayBuffer(PassRefPtr<WebGLBuffer> buffer)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectBase.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectBase.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectBase.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> void setVertexAttribDivisor(GC3Duint index, GC3Duint divisor);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebGLVertexArrayObjectBase(WebGLRenderingContextBase*, VAOType);
</del><ins>+ WebGLVertexArrayObjectBase(WebGLRenderingContextBase&, VAOType);
</ins><span class="cx"> virtual void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) = 0;
</span><span class="cx">
</span><span class="cx"> VAOType m_type;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectOEScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -34,20 +34,20 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<WebGLVertexArrayObjectOES> WebGLVertexArrayObjectOES::create(WebGLRenderingContextBase* ctx, VAOType type)
</del><ins>+Ref<WebGLVertexArrayObjectOES> WebGLVertexArrayObjectOES::create(WebGLRenderingContextBase& ctx, VAOType type)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebGLVertexArrayObjectOES(ctx, type));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebGLVertexArrayObjectOES::WebGLVertexArrayObjectOES(WebGLRenderingContextBase* ctx, VAOType type)
</del><ins>+WebGLVertexArrayObjectOES::WebGLVertexArrayObjectOES(WebGLRenderingContextBase& ctx, VAOType type)
</ins><span class="cx"> : WebGLVertexArrayObjectBase(ctx, type)
</span><span class="cx"> {
</span><del>- Extensions3D* extensions = context()->graphicsContext3D()->getExtensions();
</del><ins>+ Extensions3D& extensions = context()->graphicsContext3D()->getExtensions();
</ins><span class="cx"> switch (m_type) {
</span><span class="cx"> case VAOTypeDefault:
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- setObject(extensions->createVertexArrayOES());
</del><ins>+ setObject(extensions.createVertexArrayOES());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -59,12 +59,12 @@
</span><span class="cx">
</span><span class="cx"> void WebGLVertexArrayObjectOES::deleteObjectImpl(GraphicsContext3D* context3d, Platform3DObject object)
</span><span class="cx"> {
</span><del>- Extensions3D* extensions = context3d->getExtensions();
</del><ins>+ Extensions3D& extensions = context3d->getExtensions();
</ins><span class="cx"> switch (m_type) {
</span><span class="cx"> case VAOTypeDefault:
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- extensions->deleteVertexArrayOES(object);
</del><ins>+ extensions.deleteVertexArrayOES(object);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasWebGLVertexArrayObjectOESh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/html/canvas/WebGLVertexArrayObjectOES.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx">
</span><span class="cx"> class WebGLVertexArrayObjectOES final : public WebGLVertexArrayObjectBase {
</span><span class="cx"> public:
</span><del>- static Ref<WebGLVertexArrayObjectOES> create(WebGLRenderingContextBase*, VAOType);
</del><ins>+ static Ref<WebGLVertexArrayObjectOES> create(WebGLRenderingContextBase&, VAOType);
</ins><span class="cx"> virtual ~WebGLVertexArrayObjectOES();
</span><span class="cx"> private:
</span><del>- WebGLVertexArrayObjectOES(WebGLRenderingContextBase*, VAOType);
</del><ins>+ WebGLVertexArrayObjectOES(WebGLRenderingContextBase&, VAOType);
</ins><span class="cx"> void deleteObjectImpl(GraphicsContext3D*, Platform3DObject) override;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContext3Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext3D.h 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -1185,7 +1185,7 @@
</span><span class="cx"> // all methods it contains may necessarily be supported on the
</span><span class="cx"> // current hardware. Must call Extensions3D::supports() to
</span><span class="cx"> // determine this.
</span><del>- Extensions3D* getExtensions();
</del><ins>+ Extensions3D& getExtensions();
</ins><span class="cx">
</span><span class="cx"> IntSize getInternalFramebufferSize() const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseflGraphicsContext3DPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DPrivate.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> glBindFramebuffer(Extensions3D::DRAW_FRAMEBUFFER, m_context->m_fbo);
</span><span class="cx">
</span><span class="cx"> // Use NEAREST as no scale is performed during the blit.
</span><del>- m_context->getExtensions()->blitFramebuffer(0, 0, width, height, 0, 0, width, height, GraphicsContext3D::COLOR_BUFFER_BIT, GraphicsContext3D::NEAREST);
</del><ins>+ m_context->getExtensions().blitFramebuffer(0, 0, width, height, 0, 0, width, height, GraphicsContext3D::COLOR_BUFFER_BIT, GraphicsContext3D::NEAREST);
</ins><span class="cx">
</span><span class="cx"> if (enableScissorTest)
</span><span class="cx"> m_context->enable(GraphicsContext3D::SCISSOR_TEST);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgpuTexturecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/platform/graphics/gpu/Texture.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> *glType = GraphicsContext3D::UNSIGNED_BYTE;
</span><span class="cx"> break;
</span><span class="cx"> case Texture::BGRA8:
</span><del>- if (context->getExtensions()->supports("GL_EXT_texture_format_BGRA8888")) {
</del><ins>+ if (context->getExtensions().supports("GL_EXT_texture_format_BGRA8888")) {
</ins><span class="cx"> *glFormat = Extensions3D::BGRA_EXT;
</span><span class="cx"> *glType = GraphicsContext3D::UNSIGNED_BYTE;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> void GraphicsContext3D::readPixelsAndConvertToBGRAIfNecessary(int x, int y, int width, int height, unsigned char* pixels)
</span><span class="cx"> {
</span><span class="cx"> // NVIDIA drivers have a bug where calling readPixels in BGRA can return the wrong values for the alpha channel when the alpha is off for the context.
</span><del>- if (!m_attrs.alpha && getExtensions()->isNVIDIA()) {
</del><ins>+ if (!m_attrs.alpha && getExtensions().isNVIDIA()) {
</ins><span class="cx"> ::glReadPixels(x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
</span><span class="cx"> #if USE(ACCELERATE)
</span><span class="cx"> vImage_Buffer src;
</span><span class="lines">@@ -121,9 +121,9 @@
</span><span class="cx"> // We don't allow the logic where stencil is required and depth is not.
</span><span class="cx"> // See GraphicsContext3D::validateAttributes.
</span><span class="cx">
</span><del>- Extensions3D* extensions = getExtensions();
</del><ins>+ Extensions3D& extensions = getExtensions();
</ins><span class="cx"> // Use a 24 bit depth buffer where we know we have it.
</span><del>- if (extensions->supports("GL_EXT_packed_depth_stencil"))
</del><ins>+ if (extensions.supports("GL_EXT_packed_depth_stencil"))
</ins><span class="cx"> internalDepthStencilFormat = GL_DEPTH24_STENCIL8_EXT;
</span><span class="cx"> else
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -304,12 +304,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> case MAX_TEXTURE_SIZE:
</span><span class="cx"> ::glGetIntegerv(MAX_TEXTURE_SIZE, value);
</span><del>- if (getExtensions()->requiresRestrictedMaximumTextureSize())
</del><ins>+ if (getExtensions().requiresRestrictedMaximumTextureSize())
</ins><span class="cx"> *value = std::min(4096, *value);
</span><span class="cx"> break;
</span><span class="cx"> case MAX_CUBE_MAP_TEXTURE_SIZE:
</span><span class="cx"> ::glGetIntegerv(MAX_CUBE_MAP_TEXTURE_SIZE, value);
</span><del>- if (getExtensions()->requiresRestrictedMaximumTextureSize())
</del><ins>+ if (getExtensions().requiresRestrictedMaximumTextureSize())
</ins><span class="cx"> *value = std::min(1024, *value);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -407,11 +407,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Extensions3D* GraphicsContext3D::getExtensions()
</del><ins>+Extensions3D& GraphicsContext3D::getExtensions()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_extensions)
</span><span class="cx"> m_extensions = std::make_unique<Extensions3DOpenGL>(this, isGLES2Compliant());
</span><del>- return m_extensions.get();
</del><ins>+ return *m_extensions;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::readPixels(GC3Dint x, GC3Dint y, GC3Dsizei width, GC3Dsizei height, GC3Denum format, GC3Denum type, void* data)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -139,10 +139,10 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::validateDepthStencil(const char* packedDepthStencilExtension)
</span><span class="cx"> {
</span><del>- Extensions3D* extensions = getExtensions();
</del><ins>+ Extensions3D& extensions = getExtensions();
</ins><span class="cx"> if (m_attrs.stencil) {
</span><del>- if (extensions->supports(packedDepthStencilExtension)) {
- extensions->ensureEnabled(packedDepthStencilExtension);
</del><ins>+ if (extensions.supports(packedDepthStencilExtension)) {
+ extensions.ensureEnabled(packedDepthStencilExtension);
</ins><span class="cx"> // Force depth if stencil is true.
</span><span class="cx"> m_attrs.depth = true;
</span><span class="cx"> } else
</span><span class="lines">@@ -149,10 +149,10 @@
</span><span class="cx"> m_attrs.stencil = false;
</span><span class="cx"> }
</span><span class="cx"> if (m_attrs.antialias) {
</span><del>- if (!extensions->supports("GL_ANGLE_framebuffer_multisample") || isGLES2Compliant())
</del><ins>+ if (!extensions.supports("GL_ANGLE_framebuffer_multisample") || isGLES2Compliant())
</ins><span class="cx"> m_attrs.antialias = false;
</span><span class="cx"> else
</span><del>- extensions->ensureEnabled("GL_ANGLE_framebuffer_multisample");
</del><ins>+ extensions.ensureEnabled("GL_ANGLE_framebuffer_multisample");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1889,17 +1889,17 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::drawArraysInstanced(GC3Denum mode, GC3Dint first, GC3Dsizei count, GC3Dsizei primcount)
</span><span class="cx"> {
</span><del>- getExtensions()->drawArraysInstanced(mode, first, count, primcount);
</del><ins>+ getExtensions().drawArraysInstanced(mode, first, count, primcount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::drawElementsInstanced(GC3Denum mode, GC3Dsizei count, GC3Denum type, GC3Dintptr offset, GC3Dsizei primcount)
</span><span class="cx"> {
</span><del>- getExtensions()->drawElementsInstanced(mode, count, type, offset, primcount);
</del><ins>+ getExtensions().drawElementsInstanced(mode, count, type, offset, primcount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext3D::vertexAttribDivisor(GC3Duint index, GC3Duint divisor)
</span><span class="cx"> {
</span><del>- getExtensions()->vertexAttribDivisor(index, divisor);
</del><ins>+ getExtensions().vertexAttribDivisor(index, divisor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsopenglGraphicsContext3DOpenGLEScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> // We don't allow the logic where stencil is required and depth is not.
</span><span class="cx"> // See GraphicsContext3D::validateAttributes.
</span><del>- bool supportPackedDepthStencilBuffer = (m_attrs.stencil || m_attrs.depth) && getExtensions()->supports("GL_OES_packed_depth_stencil");
</del><ins>+ bool supportPackedDepthStencilBuffer = (m_attrs.stencil || m_attrs.depth) && getExtensions().supports("GL_OES_packed_depth_stencil");
</ins><span class="cx">
</span><span class="cx"> // Resize regular FBO.
</span><span class="cx"> bool mustRestoreFBO = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicssurfacesGLTransportSurfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/surfaces/GLTransportSurface.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/surfaces/GLTransportSurface.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/platform/graphics/surfaces/GLTransportSurface.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -105,8 +105,8 @@
</span><span class="cx"> ::glDeleteBuffers(1, &m_vbo);
</span><span class="cx">
</span><span class="cx"> if (m_vertexHandle) {
</span><del>- m_context3D->getExtensions()->bindVertexArrayOES(0);
- m_context3D->getExtensions()->deleteVertexArrayOES(m_vertexHandle);
</del><ins>+ m_context3D->getExtensions().bindVertexArrayOES(0);
+ m_context3D->getExtensions().deleteVertexArrayOES(m_vertexHandle);
</ins><span class="cx"> } else if (m_shaderProgram)
</span><span class="cx"> ::glDisableVertexAttribArray(m_shaderProgram->vertexLocation());
</span><span class="cx">
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> if (!m_context3D)
</span><span class="cx"> m_context3D = GraphicsContext3D::createForCurrentGLContext();
</span><span class="cx">
</span><del>- vertexArrayObjectSupported = m_context3D->getExtensions()->supports("GL_OES_vertex_array_object");
</del><ins>+ vertexArrayObjectSupported = m_context3D->getExtensions().supports("GL_OES_vertex_array_object");
</ins><span class="cx">
</span><span class="cx"> TextureMapperShaderProgram::Options options = TextureMapperShaderProgram::Texture;
</span><span class="cx"> m_shaderProgram = TextureMapperShaderProgram::create(*m_context3D, options);
</span><span class="lines">@@ -194,10 +194,10 @@
</span><span class="cx">
</span><span class="cx"> // Create and set-up vertex array object.
</span><span class="cx"> if (vertexArrayObjectSupported) {
</span><del>- m_vertexHandle = m_context3D->getExtensions()->createVertexArrayOES();
</del><ins>+ m_vertexHandle = m_context3D->getExtensions().createVertexArrayOES();
</ins><span class="cx">
</span><span class="cx"> if (m_vertexHandle) {
</span><del>- m_context3D->getExtensions()->bindVertexArrayOES(m_vertexHandle);
</del><ins>+ m_context3D->getExtensions().bindVertexArrayOES(m_vertexHandle);
</ins><span class="cx"> bindArrayBuffer();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapBitmapTextureGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp (208739 => 208740)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp 2016-11-15 19:31:22 UTC (rev 208739)
+++ trunk/Source/WebCore/platform/graphics/texmap/BitmapTextureGL.cpp 2016-11-15 19:42:04 UTC (rev 208740)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> m_internalFormat = GraphicsContext3D::RGBA;
</span><span class="cx"> m_format = GraphicsContext3D::BGRA;
</span><span class="cx"> if (m_context3D->isGLES2Compliant()) {
</span><del>- if (m_context3D->getExtensions()->supports("GL_EXT_texture_format_BGRA8888"))
</del><ins>+ if (m_context3D->getExtensions().supports("GL_EXT_texture_format_BGRA8888"))
</ins><span class="cx"> m_internalFormat = GraphicsContext3D::BGRA;
</span><span class="cx"> else
</span><span class="cx"> m_format = GraphicsContext3D::RGBA;
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> static bool driverSupportsSubImage(GraphicsContext3D* context)
</span><span class="cx"> {
</span><span class="cx"> if (context->isGLES2Compliant()) {
</span><del>- static bool supportsSubImage = context->getExtensions()->supports("GL_EXT_unpack_subimage");
</del><ins>+ static bool supportsSubImage = context->getExtensions().supports("GL_EXT_unpack_subimage");
</ins><span class="cx"> return supportsSubImage;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>