Changeset 65367 in webkit

Timestamp:

Aug 14, 2010 8:36:40 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-14 Matthew Delaney <​mdelaney@apple.com>

Reviewed by Kenneth Rohde Christiansen.

Canvas is not reset when setting canvas.width
​https://bugs.webkit.org/show_bug.cgi?id=43341

• html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::reset): Moved the call to hasCreatedImageBuffer up *before* the call to setSurface since setSurface sets hasCreatedImageBuffer to false every time.

Location:

trunk

Files:

• LayoutTests/fast/canvas/resources/repaint.js (added)
• LayoutTests/fast/canvas/setWidthResetAfterForcedRender.html (added)
• LayoutTests/platform/mac/fast/canvas/setWidthResetAfterForcedRender-expected.checksum (added)
• LayoutTests/platform/mac/fast/canvas/setWidthResetAfterForcedRender-expected.png (added)
• LayoutTests/platform/mac/fast/canvas/setWidthResetAfterForcedRender-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLCanvasElement.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-14  Matthew Delaney  <mdelaney@apple.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Canvas is not reset when setting canvas.width
+        https://bugs.webkit.org/show_bug.cgi?id=43341
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::reset): Moved the call to
+        hasCreatedImageBuffer up *before* the call to setSurface since setSurface
+        sets hasCreatedImageBuffer to false every time.
+
 2010-08-14  Patrick Gansterer  <paroga@paroga.com>
 

trunk/WebCore/html/HTMLCanvasElement.cpp

@@ -234 +234 @@
 
     bool ok;
+    bool hadImageBuffer = hasCreatedImageBuffer();
     int w = getAttribute(widthAttr).toInt(&ok);
     if (!ok || w < 0)
@@ -249 +250 @@
 #endif
 
-    bool hadImageBuffer = hasCreatedImageBuffer();
     if (m_context && m_context->is2d())
         static_cast<CanvasRenderingContext2D*>(m_context.get())->reset();