Changeset 95114 in webkit

Timestamp:

Sep 14, 2011 1:12:19 PM (13 years ago)

Author:

jamesr@google.com

Message:

[skia] fast/canvas/setWidthResetAfterForcedRender is flaky
​https://bugs.webkit.org/show_bug.cgi?id=67955

Reviewed by Stephen White.

When destroying an ImageBuffer due to a canvas resize, we weren't clearing the texture ID on the layer,
resulting in future compositor draw calls binding an invalid texture. This results in the test failing and
possibly drawing from a bad texture.

Covered by fast/canvas/setWidthResetAfterForcedRender.html in the GPU configuration.

• platform/graphics/chromium/Canvas2DLayerChromium.cpp:

(WebCore::Canvas2DLayerChromium::drawsContent)

• platform/graphics/skia/ImageBufferSkia.cpp:

(WebCore::ImageBuffer::~ImageBuffer):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-14  James Robinson  <jamesr@chromium.org>
+
+        [skia] fast/canvas/setWidthResetAfterForcedRender is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=67955
+
+        Reviewed by Stephen White.
+
+        When destroying an ImageBuffer due to a canvas resize, we weren't clearing the texture ID on the layer,
+        resulting in future compositor draw calls binding an invalid texture.  This results in the test failing and
+        possibly drawing from a bad texture.
+
+        Covered by fast/canvas/setWidthResetAfterForcedRender.html in the GPU configuration.
+
+        * platform/graphics/chromium/Canvas2DLayerChromium.cpp:
+        (WebCore::Canvas2DLayerChromium::drawsContent)
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::ImageBuffer::~ImageBuffer):
+
 2011-09-14  Eric Seidel  <eric@webkit.org>
 

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

@@ -61 +61 @@
 bool Canvas2DLayerChromium::drawsContent() const
 {
-    return (m_context
+    return m_textureId && (m_context
             && (m_context->getExtensions()->getGraphicsResetStatusARB() == GraphicsContext3D::NO_ERROR));
 }

trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@ -117 +117 @@
 ImageBuffer::~ImageBuffer()
 {
+#if USE(ACCELERATED_COMPOSITING)
+    if (m_data.m_platformLayer)
+        m_data.m_platformLayer->setTextureId(0);
+#endif
     if (m_context && m_context->platformContext()) {
         // This is so that the SkGpuDevice destructor has the correct context.