Skip to content
  • cmarrin@apple.com's avatar
    Rename GraphicsContext3DInternal to GraphicsContext3DPrivate and add a dummy... · 6c2ddda0
    cmarrin@apple.com authored
    Rename GraphicsContext3DInternal to GraphicsContext3DPrivate and add a dummy version of this class for Mac
    https://bugs.webkit.org/show_bug.cgi?id=67172
    
    Reviewed by Kenneth Russell.
    
    Source/WebCore: 
    
    * GNUmakefile.list.am:
    * platform/graphics/GraphicsContext3D.h:
    * platform/graphics/chromium/Extensions3DChromium.h:
    * platform/graphics/gtk/GraphicsContext3DGtk.cpp:
    (WebCore::GraphicsContext3D::create):
    (WebCore::GraphicsContext3D::GraphicsContext3D):
    (WebCore::GraphicsContext3D::~GraphicsContext3D):
    (WebCore::GraphicsContext3D::makeContextCurrent):
    (WebCore::GraphicsContext3D::platformGraphicsContext3D):
    * platform/graphics/gtk/GraphicsContext3DInternal.h: Removed.
    * platform/graphics/gtk/GraphicsContext3DPrivate.h: Copied from Source/WebCore/platform/graphics/gtk/GraphicsContext3DInternal.h.
    * platform/graphics/mac/GraphicsContext3DMac.mm:
    (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
    (WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):
    (WebCore::GraphicsContext3D::GraphicsContext3D):
    * platform/graphics/qt/GraphicsContext3DQt.cpp:
    (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
    (WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):
    (WebCore::GraphicsContext3DPrivate::getViewportGLWidget):
    (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
    (WebCore::GraphicsContext3DPrivate::boundingRect):
    (WebCore::GraphicsContext3DPrivate::paint):
    (WebCore::GraphicsContext3DPrivate::blitMultisampleFramebuffer):
    (WebCore::GraphicsContext3DPrivate::blitMultisampleFramebufferAndRestoreContext):
    (WebCore::GraphicsContext3D::create):
    (WebCore::GraphicsContext3D::GraphicsContext3D):
    (WebCore::GraphicsContext3D::~GraphicsContext3D):
    (WebCore::GraphicsContext3D::platformGraphicsContext3D):
    (WebCore::GraphicsContext3D::platformLayer):
    (WebCore::GraphicsContext3D::makeContextCurrent):
    (WebCore::GraphicsContext3D::paintRenderingResultsToCanvas):
    (WebCore::GraphicsContext3D::reshape):
    (WebCore::GraphicsContext3D::activeTexture):
    (WebCore::GraphicsContext3D::attachShader):
    (WebCore::GraphicsContext3D::getAttachedShaders):
    (WebCore::GraphicsContext3D::bindAttribLocation):
    (WebCore::GraphicsContext3D::bindBuffer):
    (WebCore::GraphicsContext3D::bindFramebuffer):
    (WebCore::GraphicsContext3D::bindRenderbuffer):
    (WebCore::GraphicsContext3D::bindTexture):
    (WebCore::GraphicsContext3D::blendColor):
    (WebCore::GraphicsContext3D::blendEquation):
    (WebCore::GraphicsContext3D::blendEquationSeparate):
    (WebCore::GraphicsContext3D::blendFunc):
    (WebCore::GraphicsContext3D::blendFuncSeparate):
    (WebCore::GraphicsContext3D::bufferData):
    (WebCore::GraphicsContext3D::bufferSubData):
    (WebCore::GraphicsContext3D::checkFramebufferStatus):
    (WebCore::GraphicsContext3D::clearColor):
    (WebCore::GraphicsContext3D::clear):
    (WebCore::GraphicsContext3D::clearDepth):
    (WebCore::GraphicsContext3D::clearStencil):
    (WebCore::GraphicsContext3D::colorMask):
    (WebCore::GraphicsContext3D::compileShader):
    (WebCore::GraphicsContext3D::copyTexImage2D):
    (WebCore::GraphicsContext3D::copyTexSubImage2D):
    (WebCore::GraphicsContext3D::cullFace):
    (WebCore::GraphicsContext3D::depthFunc):
    (WebCore::GraphicsContext3D::depthMask):
    (WebCore::GraphicsContext3D::depthRange):
    (WebCore::GraphicsContext3D::detachShader):
    (WebCore::GraphicsContext3D::disable):
    (WebCore::GraphicsContext3D::disableVertexAttribArray):
    (WebCore::GraphicsContext3D::drawArrays):
    (WebCore::GraphicsContext3D::drawElements):
    (WebCore::GraphicsContext3D::enable):
    (WebCore::GraphicsContext3D::enableVertexAttribArray):
    (WebCore::GraphicsContext3D::finish):
    (WebCore::GraphicsContext3D::flush):
    (WebCore::GraphicsContext3D::framebufferRenderbuffer):
    (WebCore::GraphicsContext3D::framebufferTexture2D):
    (WebCore::GraphicsContext3D::frontFace):
    (WebCore::GraphicsContext3D::generateMipmap):
    (WebCore::GraphicsContext3D::getActiveAttrib):
    (WebCore::GraphicsContext3D::getActiveUniform):
    (WebCore::GraphicsContext3D::getAttribLocation):
    (WebCore::GraphicsContext3D::getError):
    (WebCore::GraphicsContext3D::getString):
    (WebCore::GraphicsContext3D::hint):
    (WebCore::GraphicsContext3D::isBuffer):
    (WebCore::GraphicsContext3D::isEnabled):
    (WebCore::GraphicsContext3D::isFramebuffer):
    (WebCore::GraphicsContext3D::isProgram):
    (WebCore::GraphicsContext3D::isRenderbuffer):
    (WebCore::GraphicsContext3D::isShader):
    (WebCore::GraphicsContext3D::isTexture):
    (WebCore::GraphicsContext3D::lineWidth):
    (WebCore::GraphicsContext3D::linkProgram):
    (WebCore::GraphicsContext3D::pixelStorei):
    (WebCore::GraphicsContext3D::polygonOffset):
    (WebCore::GraphicsContext3D::readPixels):
    (WebCore::GraphicsContext3D::releaseShaderCompiler):
    (WebCore::GraphicsContext3D::renderbufferStorage):
    (WebCore::GraphicsContext3D::sampleCoverage):
    (WebCore::GraphicsContext3D::scissor):
    (WebCore::GraphicsContext3D::shaderSource):
    (WebCore::GraphicsContext3D::stencilFunc):
    (WebCore::GraphicsContext3D::stencilFuncSeparate):
    (WebCore::GraphicsContext3D::stencilMask):
    (WebCore::GraphicsContext3D::stencilMaskSeparate):
    (WebCore::GraphicsContext3D::stencilOp):
    (WebCore::GraphicsContext3D::stencilOpSeparate):
    (WebCore::GraphicsContext3D::texParameterf):
    (WebCore::GraphicsContext3D::texParameteri):
    (WebCore::GraphicsContext3D::uniform1f):
    (WebCore::GraphicsContext3D::uniform1fv):
    (WebCore::GraphicsContext3D::uniform2f):
    (WebCore::GraphicsContext3D::uniform2fv):
    (WebCore::GraphicsContext3D::uniform3f):
    (WebCore::GraphicsContext3D::uniform3fv):
    (WebCore::GraphicsContext3D::uniform4f):
    (WebCore::GraphicsContext3D::uniform4fv):
    (WebCore::GraphicsContext3D::uniform1i):
    (WebCore::GraphicsContext3D::uniform1iv):
    (WebCore::GraphicsContext3D::uniform2i):
    (WebCore::GraphicsContext3D::uniform2iv):
    (WebCore::GraphicsContext3D::uniform3i):
    (WebCore::GraphicsContext3D::uniform3iv):
    (WebCore::GraphicsContext3D::uniform4i):
    (WebCore::GraphicsContext3D::uniform4iv):
    (WebCore::GraphicsContext3D::uniformMatrix2fv):
    (WebCore::GraphicsContext3D::uniformMatrix3fv):
    (WebCore::GraphicsContext3D::uniformMatrix4fv):
    (WebCore::GraphicsContext3D::useProgram):
    (WebCore::GraphicsContext3D::validateProgram):
    (WebCore::GraphicsContext3D::vertexAttrib1f):
    (WebCore::GraphicsContext3D::vertexAttrib1fv):
    (WebCore::GraphicsContext3D::vertexAttrib2f):
    (WebCore::GraphicsContext3D::vertexAttrib2fv):
    (WebCore::GraphicsContext3D::vertexAttrib3f):
    (WebCore::GraphicsContext3D::vertexAttrib3fv):
    (WebCore::GraphicsContext3D::vertexAttrib4f):
    (WebCore::GraphicsContext3D::vertexAttrib4fv):
    (WebCore::GraphicsContext3D::vertexAttribPointer):
    (WebCore::GraphicsContext3D::viewport):
    (WebCore::GraphicsContext3D::getBooleanv):
    (WebCore::GraphicsContext3D::getBufferParameteriv):
    (WebCore::GraphicsContext3D::getFloatv):
    (WebCore::GraphicsContext3D::getFramebufferAttachmentParameteriv):
    (WebCore::GraphicsContext3D::getIntegerv):
    (WebCore::GraphicsContext3D::getProgramiv):
    (WebCore::GraphicsContext3D::getProgramInfoLog):
    (WebCore::GraphicsContext3D::getRenderbufferParameteriv):
    (WebCore::GraphicsContext3D::getShaderiv):
    (WebCore::GraphicsContext3D::getShaderInfoLog):
    (WebCore::GraphicsContext3D::getShaderSource):
    (WebCore::GraphicsContext3D::getTexParameterfv):
    (WebCore::GraphicsContext3D::getTexParameteriv):
    (WebCore::GraphicsContext3D::getUniformfv):
    (WebCore::GraphicsContext3D::getUniformiv):
    (WebCore::GraphicsContext3D::getUniformLocation):
    (WebCore::GraphicsContext3D::getVertexAttribfv):
    (WebCore::GraphicsContext3D::getVertexAttribiv):
    (WebCore::GraphicsContext3D::getVertexAttribOffset):
    (WebCore::GraphicsContext3D::texImage2D):
    (WebCore::GraphicsContext3D::texSubImage2D):
    (WebCore::GraphicsContext3D::createBuffer):
    (WebCore::GraphicsContext3D::createFramebuffer):
    (WebCore::GraphicsContext3D::createProgram):
    (WebCore::GraphicsContext3D::createRenderbuffer):
    (WebCore::GraphicsContext3D::createShader):
    (WebCore::GraphicsContext3D::createTexture):
    (WebCore::GraphicsContext3D::deleteBuffer):
    (WebCore::GraphicsContext3D::deleteFramebuffer):
    (WebCore::GraphicsContext3D::deleteProgram):
    (WebCore::GraphicsContext3D::deleteRenderbuffer):
    (WebCore::GraphicsContext3D::deleteShader):
    (WebCore::GraphicsContext3D::deleteTexture):
    
    Source/WebKit/chromium: 
    
    * WebKit.gyp:
    * src/Extensions3DChromium.cpp:
    (WebCore::Extensions3DChromium::Extensions3DChromium):
    (WebCore::Extensions3DChromium::supports):
    (WebCore::Extensions3DChromium::ensureEnabled):
    (WebCore::Extensions3DChromium::isEnabled):
    (WebCore::Extensions3DChromium::getGraphicsResetStatusARB):
    (WebCore::Extensions3DChromium::blitFramebuffer):
    (WebCore::Extensions3DChromium::renderbufferStorageMultisample):
    (WebCore::Extensions3DChromium::mapBufferSubDataCHROMIUM):
    (WebCore::Extensions3DChromium::unmapBufferSubDataCHROMIUM):
    (WebCore::Extensions3DChromium::mapTexSubImage2DCHROMIUM):
    (WebCore::Extensions3DChromium::unmapTexSubImage2DCHROMIUM):
    (WebCore::Extensions3DChromium::setSwapBuffersCompleteCallbackCHROMIUM):
    (WebCore::Extensions3DChromium::rateLimitOffscreenContextCHROMIUM):
    (WebCore::Extensions3DChromium::paintFramebufferToCanvas):
    * src/GraphicsContext3DChromium.cpp:
    (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
    (WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):
    (WebCore::GraphicsContext3DPrivate::initialize):
    (WebCore::GraphicsContext3DPrivate::extractWebGraphicsContext3D):
    (WebCore::GraphicsContext3DPrivate::platformGraphicsContext3D):
    (WebCore::GraphicsContext3DPrivate::platformTexture):
    (WebCore::GraphicsContext3DPrivate::grContext):
    (WebCore::GraphicsContext3DPrivate::prepareTexture):
    (WebCore::GraphicsContext3DPrivate::platformLayer):
    (WebCore::GraphicsContext3DPrivate::markContextChanged):
    (WebCore::GraphicsContext3DPrivate::markLayerComposited):
    (WebCore::GraphicsContext3DPrivate::layerComposited):
    (WebCore::GraphicsContext3DPrivate::paintFramebufferToCanvas):
    (WebCore::GraphicsContext3DPrivate::paintRenderingResultsToCanvas):
    (WebCore::GraphicsContext3DPrivate::paintCompositedResultsToCanvas):
    (WebCore::GraphicsContext3DPrivate::paintRenderingResultsToImageData):
    (WebCore::GraphicsContext3DPrivate::paintsIntoCanvasBuffer):
    (WebCore::GraphicsContext3DPrivate::reshape):
    (WebCore::GraphicsContext3DPrivate::getInternalFramebufferSize):
    (WebCore::GraphicsContext3DPrivate::isContextLost):
    (WebCore::GraphicsContext3DPrivate::isGLES2Compliant):
    (WebCore::GraphicsContext3DPrivate::bindAttribLocation):
    (WebCore::GraphicsContext3DPrivate::bufferData):
    (WebCore::GraphicsContext3DPrivate::bufferSubData):
    (WebCore::GraphicsContext3DPrivate::getActiveAttrib):
    (WebCore::GraphicsContext3DPrivate::getActiveUniform):
    (WebCore::GraphicsContext3DPrivate::getAttribLocation):
    (WebCore::GraphicsContext3DPrivate::getContextAttributes):
    (WebCore::GraphicsContext3DPrivate::getProgramInfoLog):
    (WebCore::GraphicsContext3DPrivate::getShaderInfoLog):
    (WebCore::GraphicsContext3DPrivate::getShaderSource):
    (WebCore::GraphicsContext3DPrivate::getString):
    (WebCore::GraphicsContext3DPrivate::getUniformLocation):
    (WebCore::GraphicsContext3DPrivate::shaderSource):
    (WebCore::GraphicsContext3DPrivate::texImage2D):
    (WebCore::GraphicsContext3DPrivate::texSubImage2D):
    (WebCore::GraphicsContext3DPrivate::uniform1fv):
    (WebCore::GraphicsContext3DPrivate::uniform1iv):
    (WebCore::GraphicsContext3DPrivate::uniform2fv):
    (WebCore::GraphicsContext3DPrivate::uniform2iv):
    (WebCore::GraphicsContext3DPrivate::uniform3fv):
    (WebCore::GraphicsContext3DPrivate::uniform3iv):
    (WebCore::GraphicsContext3DPrivate::uniform4fv):
    (WebCore::GraphicsContext3DPrivate::uniform4iv):
    (WebCore::GraphicsContext3DPrivate::uniformMatrix2fv):
    (WebCore::GraphicsContext3DPrivate::uniformMatrix3fv):
    (WebCore::GraphicsContext3DPrivate::uniformMatrix4fv):
    (WebCore::GraphicsContext3DPrivate::getExtensions):
    (WebCore::GraphicsContext3DPrivate::isResourceSafe):
    (WebCore::GraphicsContext3DPrivate::initializeExtensions):
    (WebCore::GraphicsContext3DPrivate::supportsExtension):
    (WebCore::GraphicsContext3DPrivate::ensureExtensionEnabled):
    (WebCore::GraphicsContext3DPrivate::isExtensionEnabled):
    (WebCore::GraphicsContext3D::~GraphicsContext3D):
    (WebCore::GraphicsContext3D::create):
    (WebCore::GraphicsContext3D::platformGraphicsContext3D):
    (WebCore::GraphicsContext3D::platformTexture):
    (WebCore::GraphicsContext3D::grContext):
    (WebCore::GraphicsContext3D::prepareTexture):
    (WebCore::GraphicsContext3D::getInternalFramebufferSize):
    (WebCore::GraphicsContext3D::isResourceSafe):
    (WebCore::GraphicsContext3D::platformLayer):
    (WebCore::GraphicsContext3D::layerComposited):
    (WebCore::GraphicsContext3D::paintsIntoCanvasBuffer):
    (WebCore::GraphicsContext3DPrivate::setContextLostCallback):
    (WebCore::GraphicsContext3D::isGLES2Compliant):
    (WebCore::GraphicsContext3DPrivate::setSwapBuffersCompleteCallbackCHROMIUM):
    * src/GraphicsContext3DInternal.h: Removed.
    * src/GraphicsContext3DPrivate.h: Copied from Source/WebKit/chromium/src/GraphicsContext3DInternal.h.
    * src/WebViewImpl.cpp:
    (WebKit::WebViewImpl::graphicsContext3D):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@94083 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    6c2ddda0