Changeset 109781 in webkit


Ignore:
Timestamp:
Mar 5, 2012 12:05:43 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] Remove old cleanupResources() code
​https://bugs.webkit.org/show_bug.cgi?id=80290

Patch by Dana Jansens <​danakj@chromium.org> on 2012-03-05
Reviewed by Adrienne Walker.

cleanupResources() is only called by destructors, and adds no
value, any more, beyond the destructors themselves, but complicates
the code path.

Covered by existing tests.

  • platform/graphics/chromium/cc/CCLayerImpl.cpp:
  • platform/graphics/chromium/cc/CCLayerImpl.h:

(CCLayerImpl):

  • platform/graphics/chromium/cc/CCPluginLayerImpl.cpp:

(WebCore::CCPluginLayerImpl::~CCPluginLayerImpl):

  • platform/graphics/chromium/cc/CCPluginLayerImpl.h:
  • platform/graphics/chromium/cc/CCRenderSurface.cpp:

(WebCore::CCRenderSurface::~CCRenderSurface):

  • platform/graphics/chromium/cc/CCRenderSurface.h:

(CCRenderSurface):

  • platform/graphics/chromium/cc/CCVideoLayerImpl.cpp:

(WebCore::CCVideoLayerImpl::~CCVideoLayerImpl):

Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r109779 r109781  
     12012-03-05  Dana Jansens  <danakj@chromium.org>
     2
     3        [chromium] Remove old cleanupResources() code
     4        https://bugs.webkit.org/show_bug.cgi?id=80290
     5
     6        Reviewed by Adrienne Walker.
     7
     8        cleanupResources() is only called by destructors, and adds no
     9        value, any more, beyond the destructors themselves, but complicates
     10        the code path.
     11
     12        Covered by existing tests.
     13
     14        * platform/graphics/chromium/cc/CCLayerImpl.cpp:
     15        * platform/graphics/chromium/cc/CCLayerImpl.h:
     16        (CCLayerImpl):
     17        * platform/graphics/chromium/cc/CCPluginLayerImpl.cpp:
     18        (WebCore::CCPluginLayerImpl::~CCPluginLayerImpl):
     19        * platform/graphics/chromium/cc/CCPluginLayerImpl.h:
     20        * platform/graphics/chromium/cc/CCRenderSurface.cpp:
     21        (WebCore::CCRenderSurface::~CCRenderSurface):
     22        * platform/graphics/chromium/cc/CCRenderSurface.h:
     23        (CCRenderSurface):
     24        * platform/graphics/chromium/cc/CCVideoLayerImpl.cpp:
     25        (WebCore::CCVideoLayerImpl::~CCVideoLayerImpl):
     26
    1272012-03-05  Sami Kyostila  <skyostil@chromium.org>
    228

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp

    r109466 r109781  
    195195}
    196196
    197 void CCLayerImpl::cleanupResources()
    198 {
    199     if (renderSurface())
    200         renderSurface()->cleanupResources();
    201 }
    202 
    203197const IntRect CCLayerImpl::getDrawRect() const
    204198{

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h

    r109466 r109781  
    9898    bool descendantDrawsContent();
    9999
    100     void cleanupResources();
    101 
    102100    void setAnchorPoint(const FloatPoint&);
    103101    const FloatPoint& anchorPoint() const { return m_anchorPoint; }

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCPluginLayerImpl.cpp

    r106607 r109781  
    5454CCPluginLayerImpl::~CCPluginLayerImpl()
    5555{
    56     cleanupResources();
     56    // FIXME: it seems there is no layer renderer / GraphicsContext3D available here. Ideally we
     57    // would like to delete m_ioSurfaceTextureId.
     58    m_ioSurfaceTextureId = 0;
    5759}
    5860
    … …  
    112114}
    113115
    114 void CCPluginLayerImpl::cleanupResources()
    115 {
    116     // FIXME: it seems there is no layer renderer / GraphicsContext3D available here. Ideally we
    117     // would like to delete m_ioSurfaceTextureId.
    118     m_ioSurfaceTextureId = 0;
    119 }
    120 
    121116} // namespace WebCore
    122117

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCPluginLayerImpl.h

    r108886 r109781  
    6262    virtual const char* layerTypeAsString() const { return "PluginLayer"; }
    6363
    64     void cleanupResources();
    65 
    6664    unsigned m_textureId;
    6765    bool m_flipped;

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurface.cpp

    r109466 r109781  
    5959CCRenderSurface::~CCRenderSurface()
    6060{
    61     cleanupResources();
    62 }
    63 
    64 void CCRenderSurface::cleanupResources()
    65 {
    66     if (!m_contentsTexture)
    67         return;
    68 
    69     m_contentsTexture.clear();
    7061}
    7162

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderSurface.h

    r108886 r109781  
    5656    bool prepareContentsTexture(LayerRendererChromium*);
    5757    void releaseContentsTexture();
    58     void cleanupResources();
     58
    5959    void draw(LayerRendererChromium*, const FloatRect& surfaceDamageRect);
    6060

  • trunk/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp

    r108675 r109781  
    9090    for (unsigned i = 0; i < MaxPlanes; ++i)
    9191        m_textures[i].m_texture.clear();
    92     cleanupResources();
    9392}
    9493
Note: See TracChangeset for help on using the changeset viewer.