Changeset 112165 in webkit

Timestamp:

Mar 26, 2012 3:59:53 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Chromium] Crash in Canvas2DLayerChromium::pushPropertiesTo
​https://bugs.webkit.org/show_bug.cgi?id=82243

Patch by Justin Novosad <​junov@chromium.org> on 2012-03-26
Reviewed by James Robinson.

Adding null pointer check to prevent crash and texture object
validity check to prevent potential graphics glitch

• platform/graphics/chromium/Canvas2DLayerChromium.cpp:

(WebCore::Canvas2DLayerChromium::pushPropertiesTo):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/Canvas2DLayerChromium.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-26  Justin Novosad  <junov@chromium.org>
+
+        [Chromium] Crash in Canvas2DLayerChromium::pushPropertiesTo
+        https://bugs.webkit.org/show_bug.cgi?id=82243
+
+        Reviewed by James Robinson.
+
+        Adding null pointer check to prevent crash and texture object
+        validity check to prevent potential graphics glitch
+
+        * platform/graphics/chromium/Canvas2DLayerChromium.cpp:
+        (WebCore::Canvas2DLayerChromium::pushPropertiesTo):
+
 2012-03-26  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp

@@ -155 +155 @@
 
     CCTextureLayerImpl* textureLayer = static_cast<CCTextureLayerImpl*>(layer);
-    if (m_useDoubleBuffering)
-        textureLayer->setTextureId(m_frontTexture->textureId());
-    else
+    if (m_useDoubleBuffering) {
+        if (m_frontTexture && m_frontTexture->isValid(m_size, GraphicsContext3D::RGBA))
+            textureLayer->setTextureId(m_frontTexture->textureId());
+        else
+            textureLayer->setTextureId(0);
+    } else
         textureLayer->setTextureId(m_backTextureId);
 }