Changeset 109528 in webkit


Ignore:
Timestamp:
Mar 2, 2012 1:12:43 AM (12 years ago)
Author:
kbr@google.com
Message:

[chromium] Fix errors in LayerRendererChromium cleanup
https://bugs.webkit.org/show_bug.cgi?id=80064

Reviewed by James Robinson.

Tested manually by forcing lost context while rendering Flash on
Mac OS in a Debug build.

  • platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::cleanupSharedObjects):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r109527 r109528  
     12012-03-02  Kenneth Russell  <kbr@google.com>
     2
     3        [chromium] Fix errors in LayerRendererChromium cleanup
     4        https://bugs.webkit.org/show_bug.cgi?id=80064
     5
     6        Reviewed by James Robinson.
     7
     8        Tested manually by forcing lost context while rendering Flash on
     9        Mac OS in a Debug build.
     10
     11        * platform/graphics/chromium/LayerRendererChromium.cpp:
     12        (WebCore::LayerRendererChromium::cleanupSharedObjects):
     13
    1142012-03-02  Andy Estes  <aestes@apple.com>
    215
  • trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

    r109173 r109528  
    14841484    if (m_tilerProgramOpaque)
    14851485        m_tilerProgramOpaque->cleanup(m_context.get());
    1486     if (m_tilerProgramAA)
    1487         m_tilerProgramAA->cleanup(m_context.get());
    14881486    if (m_tilerProgramSwizzle)
    14891487        m_tilerProgramSwizzle->cleanup(m_context.get());
    14901488    if (m_tilerProgramSwizzleOpaque)
    14911489        m_tilerProgramSwizzleOpaque->cleanup(m_context.get());
     1490    if (m_tilerProgramAA)
     1491        m_tilerProgramAA->cleanup(m_context.get());
    14921492    if (m_tilerProgramSwizzleAA)
    14931493        m_tilerProgramSwizzleAA->cleanup(m_context.get());
     
    14981498    if (m_pluginLayerProgramFlip)
    14991499        m_pluginLayerProgramFlip->cleanup(m_context.get());
     1500    if (m_pluginLayerTexRectProgram)
     1501        m_pluginLayerTexRectProgram->cleanup(m_context.get());
     1502    if (m_pluginLayerTexRectProgramFlip)
     1503        m_pluginLayerTexRectProgramFlip->cleanup(m_context.get());
    15001504    if (m_renderSurfaceMaskProgram)
    15011505        m_renderSurfaceMaskProgram->cleanup(m_context.get());
     1506    if (m_renderSurfaceProgram)
     1507        m_renderSurfaceProgram->cleanup(m_context.get());
    15021508    if (m_renderSurfaceMaskProgramAA)
    15031509        m_renderSurfaceMaskProgramAA->cleanup(m_context.get());
    1504     if (m_renderSurfaceProgram)
    1505         m_renderSurfaceProgram->cleanup(m_context.get());
    15061510    if (m_renderSurfaceProgramAA)
    15071511        m_renderSurfaceProgramAA->cleanup(m_context.get());
     
    15101514    if (m_videoLayerYUVProgram)
    15111515        m_videoLayerYUVProgram->cleanup(m_context.get());
     1516    if (m_videoLayerNativeTextureProgram)
     1517        m_videoLayerNativeTextureProgram->cleanup(m_context.get());
    15121518    if (m_streamTextureLayerProgram)
    15131519        m_streamTextureLayerProgram->cleanup(m_context.get());
     
    15171523    m_tilerProgram.clear();
    15181524    m_tilerProgramOpaque.clear();
    1519     m_tilerProgramAA.clear();
    15201525    m_tilerProgramSwizzle.clear();
    15211526    m_tilerProgramSwizzleOpaque.clear();
     1527    m_tilerProgramAA.clear();
    15221528    m_tilerProgramSwizzleAA.clear();
    15231529    m_canvasLayerProgram.clear();
    15241530    m_pluginLayerProgram.clear();
    15251531    m_pluginLayerProgramFlip.clear();
     1532    m_pluginLayerTexRectProgram.clear();
     1533    m_pluginLayerTexRectProgramFlip.clear();
    15261534    m_renderSurfaceMaskProgram.clear();
     1535    m_renderSurfaceProgram.clear();
    15271536    m_renderSurfaceMaskProgramAA.clear();
    1528     m_renderSurfaceProgram.clear();
    15291537    m_renderSurfaceProgramAA.clear();
    15301538    m_videoLayerRGBAProgram.clear();
    15311539    m_videoLayerYUVProgram.clear();
     1540    m_videoLayerNativeTextureProgram.clear();
    15321541    m_streamTextureLayerProgram.clear();
    15331542    if (m_offscreenFramebufferId)
Note: See TracChangeset for help on using the changeset viewer.