Changeset 117110 in webkit


Ignore:
Timestamp:
May 15, 2012 11:54:16 AM (12 years ago)
Author:
jamesr@google.com
Message:

Unreviewed, rolling out r116811.
​http://trac.webkit.org/changeset/116811
​https://bugs.webkit.org/show_bug.cgi?id=86257

Introduced layering violation

Source/WebCore:

  • WebCore.gypi:

Source/WebKit/chromium:

  • WebKit.gyp:
  • src/Extensions3DChromium.cpp: Renamed from Source/WebCore/platform/chromium/support/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):

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

(WebCore):
(WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
(WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):
(WebCore::GraphicsContext3DPrivate::createGraphicsContextFromWebContext):
(WebCore::GraphicsContext3DPrivate::extractWebGraphicsContext3D):
(WebCore::GraphicsContext3DPrivate::platformGraphicsContext3D):
(WebCore::GraphicsContext3DPrivate::platformTexture):
(GrMemoryAllocationChangedCallback):
(WebCore::GrMemoryAllocationChangedCallback::GrMemoryAllocationChangedCallback):
(WebCore::GrMemoryAllocationChangedCallback::onGpuMemoryAllocationChanged):
(WebCore::GraphicsContext3DPrivate::grContext):
(WebCore::GraphicsContext3DPrivate::prepareTexture):
(WebCore::GraphicsContext3DPrivate::markContextChanged):
(WebCore::GraphicsContext3DPrivate::markLayerComposited):
(WebCore::GraphicsContext3DPrivate::layerComposited):
(WebCore::GraphicsContext3DPrivate::paintFramebufferToCanvas):
(WebCore::GraphicsContext3DPrivate::paintRenderingResultsToCanvas):
(WebCore::GraphicsContext3DPrivate::paintCompositedResultsToCanvas):
(WebCore::GraphicsContext3DPrivate::paintRenderingResultsToImageData):
(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::~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::paintRenderingResultsToCanvas):
(WebCore::GraphicsContext3D::paintRenderingResultsToImageData):
(GraphicsContextLostCallbackAdapter):
(WebCore::GraphicsContextLostCallbackAdapter::~GraphicsContextLostCallbackAdapter):
(WebCore::GraphicsContextLostCallbackAdapter::GraphicsContextLostCallbackAdapter):
(WebCore::GraphicsContextLostCallbackAdapter::onContextLost):
(WebCore::GraphicsContextLostCallbackAdapter::create):
(WebCore::GraphicsContext3DPrivate::setContextLostCallback):
(GraphicsErrorMessageCallbackAdapter):
(WebCore::GraphicsErrorMessageCallbackAdapter::~GraphicsErrorMessageCallbackAdapter):
(WebCore::GraphicsErrorMessageCallbackAdapter::GraphicsErrorMessageCallbackAdapter):
(WebCore::GraphicsErrorMessageCallbackAdapter::onErrorMessage):
(WebCore::GraphicsErrorMessageCallbackAdapter::create):
(WebCore::GraphicsContext3DPrivate::setErrorMessageCallback):
(WebCore::GraphicsContext3D::isGLES2Compliant):
(GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::~GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::onSwapBuffersComplete):
(WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::create):
(WebCore::GraphicsContext3DPrivate::setSwapBuffersCompleteCallbackCHROMIUM):
(GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
(WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
(WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::~GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
(WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::onMemoryAllocationChanged):
(WebCore::GraphicsContext3DPrivate::setGpuMemoryAllocationChangedCallbackCHROMIUM):

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

(WebKit):
(WebCore):
(GraphicsContext3DPrivate):

Location:
trunk/Source
Files:
4 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r117109 r117110  
     12012-05-15  James Robinson  <jamesr@chromium.org>
     2
     3        Unreviewed, rolling out r116811.
     4        http://trac.webkit.org/changeset/116811
     5        https://bugs.webkit.org/show_bug.cgi?id=86257
     6
     7        Introduced layering violation
     8
     9        * WebCore.gypi:
     10
    1112012-05-15  Darin Adler  <darin@apple.com>
    212

  • trunk/Source/WebCore/WebCore.gypi

    r117065 r117110  
    82888288        ],
    82898289        'webcore_platform_support_files': [
    8290             'platform/chromium/support/Extensions3DChromium.cpp',
    8291             'platform/chromium/support/GraphicsContext3DChromium.cpp',
    8292             'platform/chromium/support/GraphicsContext3DPrivate.h',
    82938290            'platform/chromium/support/WebAudioBus.cpp',
    82948291            'platform/chromium/support/WebData.cpp',

  • trunk/Source/WebKit/chromium/ChangeLog

    r117107 r117110  
     12012-05-15  James Robinson  <jamesr@chromium.org>
     2
     3        Unreviewed, rolling out r116811.
     4        http://trac.webkit.org/changeset/116811
     5        https://bugs.webkit.org/show_bug.cgi?id=86257
     6
     7        Introduced layering violation
     8
     9        * WebKit.gyp:
     10        * src/Extensions3DChromium.cpp: Renamed from Source/WebCore/platform/chromium/support/Extensions3DChromium.cpp.
     11        (WebCore):
     12        (WebCore::Extensions3DChromium::Extensions3DChromium):
     13        (WebCore::Extensions3DChromium::~Extensions3DChromium):
     14        (WebCore::Extensions3DChromium::supports):
     15        (WebCore::Extensions3DChromium::ensureEnabled):
     16        (WebCore::Extensions3DChromium::isEnabled):
     17        (WebCore::Extensions3DChromium::getGraphicsResetStatusARB):
     18        (WebCore::Extensions3DChromium::blitFramebuffer):
     19        (WebCore::Extensions3DChromium::renderbufferStorageMultisample):
     20        (WebCore::Extensions3DChromium::postSubBufferCHROMIUM):
     21        (WebCore::Extensions3DChromium::mapBufferSubDataCHROMIUM):
     22        (WebCore::Extensions3DChromium::unmapBufferSubDataCHROMIUM):
     23        (WebCore::Extensions3DChromium::mapTexSubImage2DCHROMIUM):
     24        (WebCore::Extensions3DChromium::unmapTexSubImage2DCHROMIUM):
     25        (WebCore::Extensions3DChromium::setVisibilityCHROMIUM):
     26        (WebCore::Extensions3DChromium::discardFramebufferEXT):
     27        (WebCore::Extensions3DChromium::ensureFramebufferCHROMIUM):
     28        (WebCore::Extensions3DChromium::setGpuMemoryAllocationChangedCallbackCHROMIUM):
     29        (WebCore::Extensions3DChromium::createVertexArrayOES):
     30        (WebCore::Extensions3DChromium::deleteVertexArrayOES):
     31        (WebCore::Extensions3DChromium::isVertexArrayOES):
     32        (WebCore::Extensions3DChromium::bindVertexArrayOES):
     33        (WebCore::Extensions3DChromium::getTranslatedShaderSourceANGLE):
     34        (WebCore::Extensions3DChromium::setSwapBuffersCompleteCallbackCHROMIUM):
     35        (WebCore::Extensions3DChromium::rateLimitOffscreenContextCHROMIUM):
     36        (WebCore::Extensions3DChromium::paintFramebufferToCanvas):
     37        (WebCore::Extensions3DChromium::texImageIOSurface2DCHROMIUM):
     38        (WebCore::Extensions3DChromium::texStorage2DEXT):
     39        (WebCore::Extensions3DChromium::createQueryEXT):
     40        (WebCore::Extensions3DChromium::deleteQueryEXT):
     41        (WebCore::Extensions3DChromium::isQueryEXT):
     42        (WebCore::Extensions3DChromium::beginQueryEXT):
     43        (WebCore::Extensions3DChromium::endQueryEXT):
     44        (WebCore::Extensions3DChromium::getQueryivEXT):
     45        (WebCore::Extensions3DChromium::getQueryObjectuivEXT):
     46        * src/GraphicsContext3DChromium.cpp: Renamed from Source/WebCore/platform/chromium/support/GraphicsContext3DChromium.cpp.
     47        (WebCore):
     48        (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
     49        (WebCore::GraphicsContext3DPrivate::~GraphicsContext3DPrivate):
     50        (WebCore::GraphicsContext3DPrivate::createGraphicsContextFromWebContext):
     51        (WebCore::GraphicsContext3DPrivate::extractWebGraphicsContext3D):
     52        (WebCore::GraphicsContext3DPrivate::platformGraphicsContext3D):
     53        (WebCore::GraphicsContext3DPrivate::platformTexture):
     54        (GrMemoryAllocationChangedCallback):
     55        (WebCore::GrMemoryAllocationChangedCallback::GrMemoryAllocationChangedCallback):
     56        (WebCore::GrMemoryAllocationChangedCallback::onGpuMemoryAllocationChanged):
     57        (WebCore::GraphicsContext3DPrivate::grContext):
     58        (WebCore::GraphicsContext3DPrivate::prepareTexture):
     59        (WebCore::GraphicsContext3DPrivate::markContextChanged):
     60        (WebCore::GraphicsContext3DPrivate::markLayerComposited):
     61        (WebCore::GraphicsContext3DPrivate::layerComposited):
     62        (WebCore::GraphicsContext3DPrivate::paintFramebufferToCanvas):
     63        (WebCore::GraphicsContext3DPrivate::paintRenderingResultsToCanvas):
     64        (WebCore::GraphicsContext3DPrivate::paintCompositedResultsToCanvas):
     65        (WebCore::GraphicsContext3DPrivate::paintRenderingResultsToImageData):
     66        (WebCore::GraphicsContext3DPrivate::reshape):
     67        (WebCore::GraphicsContext3DPrivate::getInternalFramebufferSize):
     68        (WebCore::GraphicsContext3DPrivate::isContextLost):
     69        (WebCore::GraphicsContext3DPrivate::isGLES2Compliant):
     70        (WebCore::GraphicsContext3DPrivate::bindAttribLocation):
     71        (WebCore::GraphicsContext3DPrivate::bufferData):
     72        (WebCore::GraphicsContext3DPrivate::bufferSubData):
     73        (WebCore::GraphicsContext3DPrivate::getActiveAttrib):
     74        (WebCore::GraphicsContext3DPrivate::getActiveUniform):
     75        (WebCore::GraphicsContext3DPrivate::getAttribLocation):
     76        (WebCore::GraphicsContext3DPrivate::getContextAttributes):
     77        (WebCore::GraphicsContext3DPrivate::getProgramInfoLog):
     78        (WebCore::GraphicsContext3DPrivate::getShaderInfoLog):
     79        (WebCore::GraphicsContext3DPrivate::getShaderSource):
     80        (WebCore::GraphicsContext3DPrivate::getString):
     81        (WebCore::GraphicsContext3DPrivate::getUniformLocation):
     82        (WebCore::GraphicsContext3DPrivate::shaderSource):
     83        (WebCore::GraphicsContext3DPrivate::texImage2D):
     84        (WebCore::GraphicsContext3DPrivate::texSubImage2D):
     85        (WebCore::GraphicsContext3DPrivate::uniform1fv):
     86        (WebCore::GraphicsContext3DPrivate::uniform1iv):
     87        (WebCore::GraphicsContext3DPrivate::uniform2fv):
     88        (WebCore::GraphicsContext3DPrivate::uniform2iv):
     89        (WebCore::GraphicsContext3DPrivate::uniform3fv):
     90        (WebCore::GraphicsContext3DPrivate::uniform3iv):
     91        (WebCore::GraphicsContext3DPrivate::uniform4fv):
     92        (WebCore::GraphicsContext3DPrivate::uniform4iv):
     93        (WebCore::GraphicsContext3DPrivate::uniformMatrix2fv):
     94        (WebCore::GraphicsContext3DPrivate::uniformMatrix3fv):
     95        (WebCore::GraphicsContext3DPrivate::uniformMatrix4fv):
     96        (WebCore::GraphicsContext3DPrivate::getExtensions):
     97        (WebCore::GraphicsContext3DPrivate::isResourceSafe):
     98        (WebCore::GraphicsContext3DPrivate::initializeExtensions):
     99        (WebCore::GraphicsContext3DPrivate::supportsExtension):
     100        (WebCore::GraphicsContext3DPrivate::ensureExtensionEnabled):
     101        (WebCore::GraphicsContext3DPrivate::isExtensionEnabled):
     102        (WebCore::GraphicsContext3D::GraphicsContext3D):
     103        (WebCore::GraphicsContext3D::~GraphicsContext3D):
     104        (WebCore::GraphicsContext3D::create):
     105        (WebCore::GraphicsContext3D::platformGraphicsContext3D):
     106        (WebCore::GraphicsContext3D::platformTexture):
     107        (WebCore::GraphicsContext3D::grContext):
     108        (WebCore::GraphicsContext3D::prepareTexture):
     109        (WebCore::GraphicsContext3D::getInternalFramebufferSize):
     110        (WebCore::GraphicsContext3D::isResourceSafe):
     111        (WebCore::GraphicsContext3D::platformLayer):
     112        (WebCore::GraphicsContext3D::layerComposited):
     113        (WebCore::GraphicsContext3D::paintRenderingResultsToCanvas):
     114        (WebCore::GraphicsContext3D::paintRenderingResultsToImageData):
     115        (GraphicsContextLostCallbackAdapter):
     116        (WebCore::GraphicsContextLostCallbackAdapter::~GraphicsContextLostCallbackAdapter):
     117        (WebCore::GraphicsContextLostCallbackAdapter::GraphicsContextLostCallbackAdapter):
     118        (WebCore::GraphicsContextLostCallbackAdapter::onContextLost):
     119        (WebCore::GraphicsContextLostCallbackAdapter::create):
     120        (WebCore::GraphicsContext3DPrivate::setContextLostCallback):
     121        (GraphicsErrorMessageCallbackAdapter):
     122        (WebCore::GraphicsErrorMessageCallbackAdapter::~GraphicsErrorMessageCallbackAdapter):
     123        (WebCore::GraphicsErrorMessageCallbackAdapter::GraphicsErrorMessageCallbackAdapter):
     124        (WebCore::GraphicsErrorMessageCallbackAdapter::onErrorMessage):
     125        (WebCore::GraphicsErrorMessageCallbackAdapter::create):
     126        (WebCore::GraphicsContext3DPrivate::setErrorMessageCallback):
     127        (WebCore::GraphicsContext3D::isGLES2Compliant):
     128        (GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
     129        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::~GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
     130        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::GraphicsContext3DSwapBuffersCompleteCallbackAdapter):
     131        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::onSwapBuffersComplete):
     132        (WebCore::GraphicsContext3DSwapBuffersCompleteCallbackAdapter::create):
     133        (WebCore::GraphicsContext3DPrivate::setSwapBuffersCompleteCallbackCHROMIUM):
     134        (GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
     135        (WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
     136        (WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::~GraphicsContext3DMemoryAllocationChangedCallbackAdapter):
     137        (WebCore::GraphicsContext3DMemoryAllocationChangedCallbackAdapter::onMemoryAllocationChanged):
     138        (WebCore::GraphicsContext3DPrivate::setGpuMemoryAllocationChangedCallbackCHROMIUM):
     139        * src/GraphicsContext3DPrivate.h: Renamed from Source/WebCore/platform/chromium/support/GraphicsContext3DPrivate.h.
     140        (WebKit):
     141        (WebCore):
     142        (GraphicsContext3DPrivate):
     143
    11442012-05-15  Sheriff Bot  <webkit.review.bot@gmail.com>
    2145

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

    r117107 r117110  
    402402                'src/EventListenerWrapper.cpp',
    403403                'src/EventListenerWrapper.h',
     404                'src/Extensions3DChromium.cpp',
    404405                'src/ExternalPopupMenu.cpp',
    405406                'src/ExternalPopupMenu.h',
    … …  
    409410                'src/GeolocationClientProxy.cpp',
    410411                'src/GeolocationClientProxy.h',
     412                'src/GraphicsContext3DChromium.cpp',
     413                'src/GraphicsContext3DPrivate.h',
    411414                'src/gtk/WebInputEventFactory.cpp',
    412415                'src/IDBCallbacksProxy.cpp',

  • trunk/Source/WebKit/chromium/src/Extensions3DChromium.cpp

    r117109 r117110  
    2626#include "config.h"
    2727
     28#if ENABLE(WEBGL)
     29
    2830#include "Extensions3DChromium.h"
    2931
    … …  
    205207
    206208} // namespace WebCore
     209
     210#endif // ENABLE(WEBGL)
Note: See TracChangeset for help on using the changeset viewer.