Changeset 139864 in webkit

Timestamp:

Jan 16, 2013 2:59:33 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[TexMap] Composited CSS shaders crash when using non-GL TextureMapper
​https://bugs.webkit.org/show_bug.cgi?id=106796

Reviewed by Noam Rosenthal.

Fail gracefully when FilterEffectRenderer fails to build the filter effects.

• platform/graphics/texmap/TextureMapperImageBuffer.cpp:

(WebCore::BitmapTextureImageBuffer::applyFilters):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperImageBuffer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-16  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [TexMap] Composited CSS shaders crash when using non-GL TextureMapper
+        https://bugs.webkit.org/show_bug.cgi?id=106796
+
+        Reviewed by Noam Rosenthal.
+
+        Fail gracefully when FilterEffectRenderer fails to build the filter effects.
+
+        * platform/graphics/texmap/TextureMapperImageBuffer.cpp:
+        (WebCore::BitmapTextureImageBuffer::applyFilters):
+
 2013-01-15  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp

@@ -172 +172 @@
 
     // The renderer parameter is only needed for CSS shaders and reference filters.
-    renderer->build(0 /*renderer */, filters);
-    renderer->allocateBackingStoreIfNeeded();
-    GraphicsContext* context = renderer->inputContext();
-    context->drawImageBuffer(static_cast<const BitmapTextureImageBuffer&>(contentTexture).m_image.get(), ColorSpaceDeviceRGB, IntPoint::zero());
-    renderer->apply();
-    m_image->context()->drawImageBuffer(renderer->output(), ColorSpaceDeviceRGB, renderer->outputRect());
+    if (renderer->build(0 /*renderer */, filters)) {
+        renderer->allocateBackingStoreIfNeeded();
+        GraphicsContext* context = renderer->inputContext();
+        context->drawImageBuffer(static_cast<const BitmapTextureImageBuffer&>(contentTexture).m_image.get(), ColorSpaceDeviceRGB, IntPoint::zero());
+        renderer->apply();
+        m_image->context()->drawImageBuffer(renderer->output(), ColorSpaceDeviceRGB, renderer->outputRect());
+    }
     return this;
 }