Changeset 85661 in webkit

Timestamp:

May 3, 2011 2:21:27 PM (13 years ago)

Author:

jamesr@google.com

Message:

2011-05-03 James Robinson <​jamesr@chromium.org>

Reviewed by Kenneth Russell.

[chromium] Resizing a 2d canvas to huge dimensions after compositing crashes with accelerated 2d canvas option enabled
​https://bugs.webkit.org/show_bug.cgi?id=59965

Adds a test with a canvas rendered once with normal width/height dimensions then resized to very large dimensions.

• fast/canvas/canvas-resize-after-paint-expected.txt: Added.
• fast/canvas/canvas-resize-after-paint.html: Added.

2011-05-03 James Robinson <​jamesr@chromium.org>

Reviewed by Kenneth Russell.

[chromium] Resizing a 2d canvas to huge dimensions after compositing crashes with accelerated 2d canvas option enabled
​https://bugs.webkit.org/show_bug.cgi?id=59965

Fixes a few bugs leading to a crash if a canvas already being composited was resized to huge dimensions.

Test: fast/canvas/canvas-resize-after-paint.html

• html/canvas/CanvasRenderingContext2D.cpp: (WebCore::CanvasRenderingContext2D::reset):

Mark the canvas's layer as needing a synthetic style recalculation when creating or destroying the backing
DrawingBuffer so that we exit compositing mode properly if we can't handle the canvas dimensions.

• platform/graphics/chromium/Canvas2DLayerChromium.cpp: (WebCore::Canvas2DLayerChromium::setLayerRenderer):

Add a null check for m_drawingBuffer

• platform/graphics/gpu/DrawingBuffer.cpp: (WebCore::DrawingBuffer::clear):

Avoid clearing the m_context pointer in reset() - we destroy the DrawingBuffer whenever reset() fails, so
this is unnecessary.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-resize-after-paint-expected.txt (added)
• LayoutTests/fast/canvas/canvas-resize-after-paint.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-03  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] Resizing a 2d canvas to huge dimensions after compositing crashes with accelerated 2d canvas option enabled
+        https://bugs.webkit.org/show_bug.cgi?id=59965
+
+        Adds a test with a canvas rendered once with normal width/height dimensions then resized to very large dimensions.
+
+        * fast/canvas/canvas-resize-after-paint-expected.txt: Added.
+        * fast/canvas/canvas-resize-after-paint.html: Added.
+
 2011-05-03  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-03  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] Resizing a 2d canvas to huge dimensions after compositing crashes with accelerated 2d canvas option enabled
+        https://bugs.webkit.org/show_bug.cgi?id=59965
+
+        Fixes a few bugs leading to a crash if a canvas already being composited was resized to huge dimensions.
+
+        Test: fast/canvas/canvas-resize-after-paint.html
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::reset):
+            Mark the canvas's layer as needing a synthetic style recalculation when creating or destroying the backing
+            DrawingBuffer so that we exit compositing mode properly if we can't handle the canvas dimensions.
+        * platform/graphics/chromium/Canvas2DLayerChromium.cpp:
+        (WebCore::Canvas2DLayerChromium::setLayerRenderer):
+            Add a null check for m_drawingBuffer
+        * platform/graphics/gpu/DrawingBuffer.cpp:
+        (WebCore::DrawingBuffer::clear):
+            Avoid clearing the m_context pointer in reset() - we destroy the DrawingBuffer whenever reset() fails, so
+            this is unnecessary.
+
 2011-05-03  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -200 +200 @@
             if (m_drawingBuffer->reset(IntSize(canvas()->width(), canvas()->height()))) {
                 c->setSharedGraphicsContext3D(m_context3D.get(), m_drawingBuffer.get(), IntSize(canvas()->width(), canvas()->height()));
-#if USE(ACCELERATED_COMPOSITING)
-                RenderBox* renderBox = canvas()->renderBox();
-                if (renderBox && renderBox->hasLayer() && renderBox->layer()->hasAcceleratedCompositing())
-                    renderBox->layer()->contentChanged(RenderLayer::CanvasChanged);
-#endif
             } else {
                 c->setSharedGraphicsContext3D(0, 0, IntSize());
@@ -210 +205 @@
                 m_context3D.clear();
             }
+#if USE(ACCELERATED_COMPOSITING)
+            RenderBox* renderBox = canvas()->renderBox();
+            if (renderBox && renderBox->hasLayer() && renderBox->layer()->hasAcceleratedCompositing())
+                renderBox->layer()->contentChanged(RenderLayer::CanvasChanged);
+#endif
         }
     }

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

@@ -120 +120 @@
 void Canvas2DLayerChromium::setLayerRenderer(LayerRendererChromium* newLayerRenderer)
 {
-    if (layerRenderer() != newLayerRenderer) {
+    if (layerRenderer() != newLayerRenderer && m_drawingBuffer) {
         if (m_drawingBuffer->graphicsContext3D()) {
             if (layerRenderer())

trunk/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp

@@ -93 +93 @@
     m_context->deleteFramebuffer(m_fbo);
     m_fbo = 0;
-    
-    m_context.clear();
 }