Changeset 119651 in webkit


Ignore:
Timestamp:
Jun 6, 2012 5:38:21 PM (12 years ago)
Author:
jamesr@google.com
Message:

[chromium] Move implementation of WebCore::GraphicsContext3D and related from WebKit/chromium/src to WebCore/platform/chromium/support
​https://bugs.webkit.org/show_bug.cgi?id=86257

Reviewed by Kenneth Russell.

Source/WebCore:

The WebCore platform interfaces GraphicsContext3D and Extensions3DChromium are implemented in chromium
on top of the Platform interface WebGraphicsContext3D. This moves the implementation support code from
WebKit/chromium/src to WebCore/platform/chromium/support, which avoids having code in WebKit/ implementing WebCore
interfaces and allows code in WebCore/platform to use this support code directly where appropriate.

Refactor only, no new functionality or tests.

  • WebCore.gypi:
  • platform/chromium/support/Extensions3DChromium.cpp: Renamed from Source/WebKit/chromium/src/Extensions3DChromium.cpp.

(WebCore):
(WebCore::Extensions3DChromium::Extensions3DChromium):
(WebCore::Extensions3DChromium::~Extensions3DChromium):
(WebCore::Extensions3DChromium::supports):
(WebCore::Extensions3DChromium::ensureEnabled):
(WebCore::Extensions3DChromium::isEnabled):
(WebCore::Extensions3DChromium::getGraphicsResetStatusARB):
(WebCore::Extensions3DChromium::blitFramebuffer):
(WebCore::Extensions3DChromium::renderbufferStorageMultisample):
(WebCore::Extensions3DChromium::postSubBufferCHROMIUM):
(WebCore::Extensions3DChromium::mapBufferSubDataCHROMIUM):
(WebCore::Extensions3DChromium::unmapBufferSubDataCHROMIUM):
(WebCore::Extensions3DChromium::mapTexSubImage2DCHROMIUM):
(WebCore::Extensions3DChromium::unmapTexSubImage2DCHROMIUM):
(WebCore::Extensions3DChromium::setVisibilityCHROMIUM):
(WebCore::Extensions3DChromium::discardFramebufferEXT):
(WebCore::Extensions3DChromium::ensureFramebufferCHROMIUM):
(WebCore::Extensions3DChromium::setGpuMemoryAllocationChangedCallbackCHROMIUM):
(WebCore::Extensions3DChromium::createVertexArrayOES):
(WebCore::Extensions3DChromium::deleteVertexArrayOES):
(WebCore::Extensions3DChromium::isVertexArrayOES):
(WebCore::Extensions3DChromium::bindVertexArrayOES):
(WebCore::Extensions3DChromium::getTranslatedShaderSourceANGLE):
(WebCore::Extensions3DChromium::setSwapBuffersCompleteCallbackCHROMIUM):
(WebCore::Extensions3DChromium::rateLimitOffscreenContextCHROMIUM):
(WebCore::Extensions3DChromium::paintFramebufferToCanvas):
(WebCore::Extensions3DChromium::texImageIOSurface2DCHROMIUM):
(WebCore::Extensions3DChromium::texStorage2DEXT):
(WebCore::Extensions3DChromium::createQueryEXT):
(WebCore::Extensions3DChromium::deleteQueryEXT):
(WebCore::Extensions3DChromium::isQueryEXT):
(WebCore::Extensions3DChromium::beginQueryEXT):
(WebCore::Extensions3DChromium::endQueryEXT):
(WebCore::Extensions3DChromium::getQueryivEXT):
(WebCore::Extensions3DChromium::getQueryObjectuivEXT):

  • platform/chromium/support/GraphicsContext3DChromium.cpp: Renamed from Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp.

(WebCore):
(WebCore::GraphicsContext3D::GraphicsContext3D):
(WebCore::GraphicsContext3D::~GraphicsContext3D):
(WebCore::GraphicsContext3D::setContextLostCallback):
(WebCore::GraphicsContext3D::setErrorMessageCallback):
(WebCore::GraphicsContext3D::create):
(WebCore::GraphicsContext3D::platformGraphicsContext3D):
(WebCore::GraphicsContext3D::platformTexture):
(WebCore::GraphicsContext3D::grContext):
(WebCore::GraphicsContext3D::platformLayer):
(WebCore::GraphicsContext3D::isGLES2Compliant):
(WebCore::GraphicsContext3D::isResourceSafe):
(WebCore::GraphicsContext3D::bindAttribLocation):
(WebCore::GraphicsContext3D::bufferData):
(WebCore::GraphicsContext3D::getActiveAttrib):
(WebCore::GraphicsContext3D::getActiveUniform):
(WebCore::GraphicsContext3D::getAttribLocation):
(WebCore::GraphicsContext3D::getContextAttributes):
(WebCore::GraphicsContext3D::getProgramInfoLog):
(WebCore::GraphicsContext3D::getShaderInfoLog):
(WebCore::GraphicsContext3D::getShaderSource):
(WebCore::GraphicsContext3D::getString):
(WebCore::GraphicsContext3D::getUniformLocation):
(WebCore::GraphicsContext3D::shaderSource):
(WebCore::GraphicsContext3D::texImage2D):
(WebCore::GraphicsContext3D::texSubImage2D):
(WebCore::GraphicsContext3D::reshape):
(WebCore::GraphicsContext3D::markContextChanged):
(WebCore::GraphicsContext3D::layerComposited):
(WebCore::GraphicsContext3D::markLayerComposited):
(WebCore::GraphicsContext3D::paintRenderingResultsToCanvas):
(WebCore::GraphicsContext3D::paintRenderingResultsToImageData):
(WebCore::GraphicsContext3D::paintCompositedResultsToCanvas):
(WebCore::GraphicsContext3D::getExtensions):
(WebCore::GraphicsContext3D::getInternalFramebufferSize):

  • platform/chromium/support/GraphicsContext3DPrivate.cpp: Renamed from Source/WebKit/chromium/src/GraphicsContext3DPrivate.cpp.

(WebCore):
(WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
(WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):
(WebCore::GraphicsContext3DPrivate::createGraphicsContextFromWebContext):
(WebCore::GraphicsContext3DPrivate::extractWebGraphicsContext3D):
(GrMemoryAllocationChangedCallback):
(WebCore::GrMemoryAllocationChangedCallback::GrMemoryAllocationChangedCallback):
(WebCore::GrMemoryAllocationChangedCallback::onGpuMemoryAllocationChanged):
(WebCore::GraphicsContext3DPrivate::grContext):
(WebCore::GraphicsContext3DPrivate::markContextChanged):
(WebCore::GraphicsContext3DPrivate::layerComposited):
(WebCore::GraphicsContext3DPrivate::markLayerComposited):
(WebCore::GraphicsContext3DPrivate::paintFramebufferToCanvas):
(GraphicsContext3DContextLostCallbackAdapter):
(WebCore::GraphicsContext3DContextLostCallbackAdapter::GraphicsContext3DContextLostCallbackAdapter):
(WebCore::GraphicsContext3DContextLostCallbackAdapter::~GraphicsContext3DContextLostCallbackAdapter):
(WebCore::GraphicsContext3DContextLostCallbackAdapter::onContextLost):
(WebCore::GraphicsContext3DPrivate::setContextLostCallback):
(GraphicsContext3DErrorMessageCallbackAdapter):
(WebCore::GraphicsContext3DErrorMessageCallbackAdapter::GraphicsContext3DErrorMessageCallbackAdapter):
(WebCore::GraphicsContext3DErrorMessageCallbackAdapter::~GraphicsContext3DErrorMessageCallbackAdapter):
(WebCore::GraphicsContext3DErrorMessageCallbackAdapter::onErrorMessage):
(WebCore::GraphicsContext3DPrivate::setErrorMessageCallback):
(WebCore::GraphicsContext3DPrivate::getExtensions):
(WebCore::GraphicsContext3DPrivate::initializeExtensions):
(WebCore::GraphicsContext3DPrivate::supportsExtension):
(WebCore::GraphicsContext3DPrivate::ensureExtensionEnabled):
(WebCore::GraphicsContext3DPrivate::isExtensionEnabled):
(WebCore::GraphicsContext3DPrivate::isResourceSafe):
(GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
(WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
(WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::~GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
(WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::onMemoryAllocationChanged):
(WebCore::GraphicsContext3DPrivate::setGpuMemoryAllocationChangedCallbackCHROMIUM):
(GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::~GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::onSwapBuffersComplete):
(WebCore::GraphicsContext3DPrivate::setSwapBuffersCompleteCallbackCHROMIUM):

  • platform/chromium/support/GraphicsContext3DPrivate.h: Renamed from Source/WebKit/chromium/src/GraphicsContext3DPrivate.h.

(WebKit):
(WebCore):
(GraphicsContext3DPrivate):
(WebCore::GraphicsContext3DPrivate::webContext):
(WebCore::GraphicsContext3DPrivate::preserveDrawingBuffer):

Source/WebKit/chromium:

  • WebKit.gyp:
Location:
trunk/Source
Files:
4 edited
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r119648 r119651  
     12012-06-06  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Move implementation of WebCore::GraphicsContext3D and related from WebKit/chromium/src to WebCore/platform/chromium/support
     4        https://bugs.webkit.org/show_bug.cgi?id=86257
     5
     6        Reviewed by Kenneth Russell.
     7
     8        The WebCore platform interfaces GraphicsContext3D and Extensions3DChromium are implemented in chromium
     9        on top of the Platform interface WebGraphicsContext3D. This moves the implementation support code from
     10        WebKit/chromium/src to WebCore/platform/chromium/support, which avoids having code in WebKit/ implementing WebCore
     11        interfaces and allows code in WebCore/platform to use this support code directly where appropriate.
     12
     13        Refactor only, no new functionality or tests.
     14
     15        * WebCore.gypi:
     16        * platform/chromium/support/Extensions3DChromium.cpp: Renamed from Source/WebKit/chromium/src/Extensions3DChromium.cpp.
     17        (WebCore):
     18        (WebCore::Extensions3DChromium::Extensions3DChromium):
     19        (WebCore::Extensions3DChromium::~Extensions3DChromium):
     20        (WebCore::Extensions3DChromium::supports):
     21        (WebCore::Extensions3DChromium::ensureEnabled):
     22        (WebCore::Extensions3DChromium::isEnabled):
     23        (WebCore::Extensions3DChromium::getGraphicsResetStatusARB):
     24        (WebCore::Extensions3DChromium::blitFramebuffer):
     25        (WebCore::Extensions3DChromium::renderbufferStorageMultisample):
     26        (WebCore::Extensions3DChromium::postSubBufferCHROMIUM):
     27        (WebCore::Extensions3DChromium::mapBufferSubDataCHROMIUM):
     28        (WebCore::Extensions3DChromium::unmapBufferSubDataCHROMIUM):
     29        (WebCore::Extensions3DChromium::mapTexSubImage2DCHROMIUM):
     30        (WebCore::Extensions3DChromium::unmapTexSubImage2DCHROMIUM):
     31        (WebCore::Extensions3DChromium::setVisibilityCHROMIUM):
     32        (WebCore::Extensions3DChromium::discardFramebufferEXT):
     33        (WebCore::Extensions3DChromium::ensureFramebufferCHROMIUM):
     34        (WebCore::Extensions3DChromium::setGpuMemoryAllocationChangedCallbackCHROMIUM):
     35        (WebCore::Extensions3DChromium::createVertexArrayOES):
     36        (WebCore::Extensions3DChromium::deleteVertexArrayOES):
     37        (WebCore::Extensions3DChromium::isVertexArrayOES):
     38        (WebCore::Extensions3DChromium::bindVertexArrayOES):
     39        (WebCore::Extensions3DChromium::getTranslatedShaderSourceANGLE):
     40        (WebCore::Extensions3DChromium::setSwapBuffersCompleteCallbackCHROMIUM):
     41        (WebCore::Extensions3DChromium::rateLimitOffscreenContextCHROMIUM):
     42        (WebCore::Extensions3DChromium::paintFramebufferToCanvas):
     43        (WebCore::Extensions3DChromium::texImageIOSurface2DCHROMIUM):
     44        (WebCore::Extensions3DChromium::texStorage2DEXT):
     45        (WebCore::Extensions3DChromium::createQueryEXT):
     46        (WebCore::Extensions3DChromium::deleteQueryEXT):
     47        (WebCore::Extensions3DChromium::isQueryEXT):
     48        (WebCore::Extensions3DChromium::beginQueryEXT):
     49        (WebCore::Extensions3DChromium::endQueryEXT):
     50        (WebCore::Extensions3DChromium::getQueryivEXT):
     51        (WebCore::Extensions3DChromium::getQueryObjectuivEXT):
     52        * platform/chromium/support/GraphicsContext3DChromium.cpp: Renamed from Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp.
     53        (WebCore):
     54        (WebCore::GraphicsContext3D::GraphicsContext3D):
     55        (WebCore::GraphicsContext3D::~GraphicsContext3D):
     56        (WebCore::GraphicsContext3D::setContextLostCallback):
     57        (WebCore::GraphicsContext3D::setErrorMessageCallback):
     58        (WebCore::GraphicsContext3D::create):
     59        (WebCore::GraphicsContext3D::platformGraphicsContext3D):
     60        (WebCore::GraphicsContext3D::platformTexture):
     61        (WebCore::GraphicsContext3D::grContext):
     62        (WebCore::GraphicsContext3D::platformLayer):
     63        (WebCore::GraphicsContext3D::isGLES2Compliant):
     64        (WebCore::GraphicsContext3D::isResourceSafe):
     65        (WebCore::GraphicsContext3D::bindAttribLocation):
     66        (WebCore::GraphicsContext3D::bufferData):
     67        (WebCore::GraphicsContext3D::getActiveAttrib):
     68        (WebCore::GraphicsContext3D::getActiveUniform):
     69        (WebCore::GraphicsContext3D::getAttribLocation):
     70        (WebCore::GraphicsContext3D::getContextAttributes):
     71        (WebCore::GraphicsContext3D::getProgramInfoLog):
     72        (WebCore::GraphicsContext3D::getShaderInfoLog):
     73        (WebCore::GraphicsContext3D::getShaderSource):
     74        (WebCore::GraphicsContext3D::getString):
     75        (WebCore::GraphicsContext3D::getUniformLocation):
     76        (WebCore::GraphicsContext3D::shaderSource):
     77        (WebCore::GraphicsContext3D::texImage2D):
     78        (WebCore::GraphicsContext3D::texSubImage2D):
     79        (WebCore::GraphicsContext3D::reshape):
     80        (WebCore::GraphicsContext3D::markContextChanged):
     81        (WebCore::GraphicsContext3D::layerComposited):
     82        (WebCore::GraphicsContext3D::markLayerComposited):
     83        (WebCore::GraphicsContext3D::paintRenderingResultsToCanvas):
     84        (WebCore::GraphicsContext3D::paintRenderingResultsToImageData):
     85        (WebCore::GraphicsContext3D::paintCompositedResultsToCanvas):
     86        (WebCore::GraphicsContext3D::getExtensions):
     87        (WebCore::GraphicsContext3D::getInternalFramebufferSize):
     88        * platform/chromium/support/GraphicsContext3DPrivate.cpp: Renamed from Source/WebKit/chromium/src/GraphicsContext3DPrivate.cpp.
     89        (WebCore):
     90        (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
     91        (WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):
     92        (WebCore::GraphicsContext3DPrivate::createGraphicsContextFromWebContext):
     93        (WebCore::GraphicsContext3DPrivate::extractWebGraphicsContext3D):
     94        (GrMemoryAllocationChangedCallback):
     95        (WebCore::GrMemoryAllocationChangedCallback::GrMemoryAllocationChangedCallback):
     96        (WebCore::GrMemoryAllocationChangedCallback::onGpuMemoryAllocationChanged):
     97        (WebCore::GraphicsContext3DPrivate::grContext):
     98        (WebCore::GraphicsContext3DPrivate::markContextChanged):
     99        (WebCore::GraphicsContext3DPrivate::layerComposited):
     100        (WebCore::GraphicsContext3DPrivate::markLayerComposited):
     101        (WebCore::GraphicsContext3DPrivate::paintFramebufferToCanvas):
     102        (GraphicsContext3DContextLostCallbackAdapter):
     103        (WebCore::GraphicsContext3DContextLostCallbackAdapter::GraphicsContext3DContextLostCallbackAdapter):
     104        (WebCore::GraphicsContext3DContextLostCallbackAdapter::~GraphicsContext3DContextLostCallbackAdapter):
     105        (WebCore::GraphicsContext3DContextLostCallbackAdapter::onContextLost):
     106        (WebCore::GraphicsContext3DPrivate::setContextLostCallback):
     107        (GraphicsContext3DErrorMessageCallbackAdapter):
     108        (WebCore::GraphicsContext3DErrorMessageCallbackAdapter::GraphicsContext3DErrorMessageCallbackAdapter):
     109        (WebCore::GraphicsContext3DErrorMessageCallbackAdapter::~GraphicsContext3DErrorMessageCallbackAdapter):
     110        (WebCore::GraphicsContext3DErrorMessageCallbackAdapter::onErrorMessage):
     111        (WebCore::GraphicsContext3DPrivate::setErrorMessageCallback):
     112        (WebCore::GraphicsContext3DPrivate::getExtensions):
     113        (WebCore::GraphicsContext3DPrivate::initializeExtensions):
     114        (WebCore::GraphicsContext3DPrivate::supportsExtension):
     115        (WebCore::GraphicsContext3DPrivate::ensureExtensionEnabled):
     116        (WebCore::GraphicsContext3DPrivate::isExtensionEnabled):
     117        (WebCore::GraphicsContext3DPrivate::isResourceSafe):
     118        (GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
     119        (WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
     120        (WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::~GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
     121        (WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::onMemoryAllocationChanged):
     122        (WebCore::GraphicsContext3DPrivate::setGpuMemoryAllocationChangedCallbackCHROMIUM):
     123        (GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
     124        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
     125        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::~GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
     126        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::onSwapBuffersComplete):
     127        (WebCore::GraphicsContext3DPrivate::setSwapBuffersCompleteCallbackCHROMIUM):
     128        * platform/chromium/support/GraphicsContext3DPrivate.h: Renamed from Source/WebKit/chromium/src/GraphicsContext3DPrivate.h.
     129        (WebKit):
     130        (WebCore):
     131        (GraphicsContext3DPrivate):
     132        (WebCore::GraphicsContext3DPrivate::webContext):
     133        (WebCore::GraphicsContext3DPrivate::preserveDrawingBuffer):
     134
    11352012-06-06  Sheriff Bot  <webkit.review.bot@gmail.com>
    2136

  • trunk/Source/WebCore/WebCore.gypi

    r119572 r119651  
    83208320        ],
    83218321        'webcore_platform_support_files': [
     8322            'platform/chromium/support/Extensions3DChromium.cpp',
     8323            'platform/chromium/support/GraphicsContext3DChromium.cpp',
     8324            'platform/chromium/support/GraphicsContext3DPrivate.cpp',
     8325            'platform/chromium/support/GraphicsContext3DPrivate.h',
    83228326            'platform/chromium/support/WebAudioBus.cpp',
    83238327            'platform/chromium/support/WebData.cpp',

  • trunk/Source/WebKit/chromium/ChangeLog

    r119635 r119651  
     12012-06-06  James Robinson  <jamesr@chromium.org>
     2
     3        [chromium] Move implementation of WebCore::GraphicsContext3D and related from WebKit/chromium/src to WebCore/platform/chromium/support
     4        https://bugs.webkit.org/show_bug.cgi?id=86257
     5
     6        Reviewed by Kenneth Russell.
     7
     8        * WebKit.gyp:
     9
    1102012-06-06  James Robinson  <jamesr@chromium.org>
    211

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r119631 r119651  
    391391                'src/EventListenerWrapper.cpp',
    392392                'src/EventListenerWrapper.h',
    393                 'src/Extensions3DChromium.cpp',
    394393                'src/ExternalPopupMenu.cpp',
    395394                'src/ExternalPopupMenu.h',
    … …  
    399398                'src/GeolocationClientProxy.cpp',
    400399                'src/GeolocationClientProxy.h',
    401                 'src/GraphicsContext3DChromium.cpp',
    402                 'src/GraphicsContext3DPrivate.cpp',
    403                 'src/GraphicsContext3DPrivate.h',
    404400                'src/gtk/WebInputEventFactory.cpp',
    405401                'src/WebHelperPluginImpl.cpp',
Note: See TracChangeset for help on using the changeset viewer.