[webkit-changes] [109528] trunk/Source/WebCore

[kbr]

Title: [109528] trunk/Source/WebCore

Revision

109528

Author

k...@google.com

Date

2012-03-02 01:12:43 -0800 (Fri, 02 Mar 2012)

Log 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):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (109527 => 109528)

--- trunk/Source/WebCore/ChangeLog	2012-03-02 09:05:09 UTC (rev 109527)
+++ trunk/Source/WebCore/ChangeLog	2012-03-02 09:12:43 UTC (rev 109528)
@@ -1,3 +1,16 @@
+2012-03-02  Kenneth Russell  <k...@google.com>
+
+        [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):
+
 2012-03-02  Andy Estes  <aes...@apple.com>
 
         Fix errors found when building the Mac port with ICONDATABASE disabled.

Modified: trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (109527 => 109528)

--- trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp	2012-03-02 09:05:09 UTC (rev 109527)
+++ trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp	2012-03-02 09:12:43 UTC (rev 109528)
@@ -1483,12 +1483,12 @@
         m_tilerProgram->cleanup(m_context.get());
     if (m_tilerProgramOpaque)
         m_tilerProgramOpaque->cleanup(m_context.get());
-    if (m_tilerProgramAA)
-        m_tilerProgramAA->cleanup(m_context.get());
     if (m_tilerProgramSwizzle)
         m_tilerProgramSwizzle->cleanup(m_context.get());
     if (m_tilerProgramSwizzleOpaque)
         m_tilerProgramSwizzleOpaque->cleanup(m_context.get());
+    if (m_tilerProgramAA)
+        m_tilerProgramAA->cleanup(m_context.get());
     if (m_tilerProgramSwizzleAA)
         m_tilerProgramSwizzleAA->cleanup(m_context.get());
     if (m_canvasLayerProgram)
@@ -1497,18 +1497,24 @@
         m_pluginLayerProgram->cleanup(m_context.get());
     if (m_pluginLayerProgramFlip)
         m_pluginLayerProgramFlip->cleanup(m_context.get());
+    if (m_pluginLayerTexRectProgram)
+        m_pluginLayerTexRectProgram->cleanup(m_context.get());
+    if (m_pluginLayerTexRectProgramFlip)
+        m_pluginLayerTexRectProgramFlip->cleanup(m_context.get());
     if (m_renderSurfaceMaskProgram)
         m_renderSurfaceMaskProgram->cleanup(m_context.get());
+    if (m_renderSurfaceProgram)
+        m_renderSurfaceProgram->cleanup(m_context.get());
     if (m_renderSurfaceMaskProgramAA)
         m_renderSurfaceMaskProgramAA->cleanup(m_context.get());
-    if (m_renderSurfaceProgram)
-        m_renderSurfaceProgram->cleanup(m_context.get());
     if (m_renderSurfaceProgramAA)
         m_renderSurfaceProgramAA->cleanup(m_context.get());
     if (m_videoLayerRGBAProgram)
         m_videoLayerRGBAProgram->cleanup(m_context.get());
     if (m_videoLayerYUVProgram)
         m_videoLayerYUVProgram->cleanup(m_context.get());
+    if (m_videoLayerNativeTextureProgram)
+        m_videoLayerNativeTextureProgram->cleanup(m_context.get());
     if (m_streamTextureLayerProgram)
         m_streamTextureLayerProgram->cleanup(m_context.get());
 
@@ -1516,19 +1522,22 @@
     m_headsUpDisplayProgram.clear();
     m_tilerProgram.clear();
     m_tilerProgramOpaque.clear();
-    m_tilerProgramAA.clear();
     m_tilerProgramSwizzle.clear();
     m_tilerProgramSwizzleOpaque.clear();
+    m_tilerProgramAA.clear();
     m_tilerProgramSwizzleAA.clear();
     m_canvasLayerProgram.clear();
     m_pluginLayerProgram.clear();
     m_pluginLayerProgramFlip.clear();
+    m_pluginLayerTexRectProgram.clear();
+    m_pluginLayerTexRectProgramFlip.clear();
     m_renderSurfaceMaskProgram.clear();
+    m_renderSurfaceProgram.clear();
     m_renderSurfaceMaskProgramAA.clear();
-    m_renderSurfaceProgram.clear();
     m_renderSurfaceProgramAA.clear();
     m_videoLayerRGBAProgram.clear();
     m_videoLayerYUVProgram.clear();
+    m_videoLayerNativeTextureProgram.clear();
     m_streamTextureLayerProgram.clear();
     if (m_offscreenFramebufferId)
         GLC(m_context.get(), m_context->deleteFramebuffer(m_offscreenFramebufferId));

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes