Changeset 93901 in webkit

Timestamp:

Aug 26, 2011, 12:11:59 PM (14 years ago)

Author:

senorblanco@chromium.org

Message:

Assertion fires if canvas is resized while save() active
​https://bugs.webkit.org/show_bug.cgi?id=66710

Reviewed by Simon Fraser.

Source/WebCore:

Test: fast/canvas/resize-while-save-active.html

• html/HTMLCanvasElement.cpp:

(WebCore::HTMLCanvasElement::reset):
Call CanvasRenderingContext2D::reset() before resizing the canvas,
so that the GraphicsContext state stack can be unwound.

• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::CanvasRenderingContext2D::unwindStateStack):
(WebCore::CanvasRenderingContext2D::~CanvasRenderingContext2D):
Refactor the state stack unwinding code from the destructor to
unwindStateStack() (new).
(WebCore::CanvasRenderingContext2D::reset):
Unwind the GraphicsContext state stack when the context is reset.

• html/canvas/CanvasRenderingContext2D.h:

LayoutTests:

• fast/canvas/resize-while-save-active-expected.txt: Added.
• fast/canvas/resize-while-save-active.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/resize-while-save-active-expected.txt (added)
• LayoutTests/fast/canvas/resize-while-save-active.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLCanvasElement.cpp (modified) (2 diffs)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (3 diffs)
• Source/WebCore/html/canvas/CanvasRenderingContext2D.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-23  Stephen White  <senorblanco@chromium.org>
+
+        Assertion fires if canvas is resized while save() active
+        https://bugs.webkit.org/show_bug.cgi?id=66710
+
+        Reviewed by Simon Fraser.
+
+        * fast/canvas/resize-while-save-active-expected.txt: Added.
+        * fast/canvas/resize-while-save-active.html: Added.
+
 2011-08-26  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-23  Stephen White  <senorblanco@chromium.org>
+
+        Assertion fires if canvas is resized while save() active
+        https://bugs.webkit.org/show_bug.cgi?id=66710
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/canvas/resize-while-save-active.html
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::reset):
+        Call CanvasRenderingContext2D::reset() before resizing the canvas,
+        so that the GraphicsContext state stack can be unwound.
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::unwindStateStack):
+        (WebCore::CanvasRenderingContext2D::~CanvasRenderingContext2D):
+        Refactor the state stack unwinding code from the destructor to 
+        unwindStateStack() (new).
+        (WebCore::CanvasRenderingContext2D::reset):
+        Unwind the GraphicsContext state stack when the context is reset.
+        * html/canvas/CanvasRenderingContext2D.h:
+
 2011-08-26  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -238 +238 @@
         h = DefaultHeight;
 
+    if (m_context && m_context->is2d()) {
+        CanvasRenderingContext2D* context2D = static_cast<CanvasRenderingContext2D*>(m_context.get());
+        context2D->reset();
+    }
+
     IntSize oldSize = size();
     setSurfaceSize(IntSize(w, h)); // The image buffer gets cleared here.
@@ -245 +250 @@
         static_cast<WebGLRenderingContext*>(m_context.get())->reshape(width(), height());
 #endif
-
-    if (m_context && m_context->is2d()) {
-        CanvasRenderingContext2D* context2D = static_cast<CanvasRenderingContext2D*>(m_context.get());
-        context2D->reset();
-    }
 
     if (RenderObject* renderer = this->renderer()) {

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

@@ -128 +128 @@
 }
 
-CanvasRenderingContext2D::~CanvasRenderingContext2D()
-{
-#if !ASSERT_DISABLED
+void CanvasRenderingContext2D::unwindStateStack()
+{
     // Ensure that the state stack in the ImageBuffer's context
     // is cleared before destruction, to avoid assertions in the
@@ -140 +139 @@
         }
     }
+}
+
+CanvasRenderingContext2D::~CanvasRenderingContext2D()
+{
+#if !ASSERT_DISABLED
+    unwindStateStack();
 #endif
 }
@@ -171 +176 @@
 void CanvasRenderingContext2D::reset()
 {
+    unwindStateStack();
     m_stateStack.resize(1);
     m_stateStack.first() = State();

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

@@ -274 +274 @@
     GraphicsContext* drawingContext() const;
 
+    void unwindStateStack();
+
     void applyStrokePattern();
     void applyFillPattern();