Changeset 24090 in webkit

Timestamp:

Jul 7, 2007 1:14:41 PM (17 years ago)

Author:

darin

Message:

LayoutTests:

Reviewed by Darin.

Testcase for:
​http://bugs.webkit.org/show_bug.cgi?id=8994
Canvas doesn't reset on resize

• fast/canvas/canvas-resize-reset-expected.checksum: Added.
• fast/canvas/canvas-resize-reset-expected.png: Added.
• fast/canvas/canvas-resize-reset-expected.txt: Added.
• fast/canvas/canvas-resize-reset.html: Added.

WebCore:

Reviewed and tweaked by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=8994
Canvas doesn't reset on resize

Also reset the rendering context when resetting the canvas.

• html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::reset): (WebCore::HTMLCanvasElement::drawingContext):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-resize-reset-expected.checksum (added)
• LayoutTests/fast/canvas/canvas-resize-reset-expected.png (added)
• LayoutTests/fast/canvas/canvas-resize-reset-expected.txt (added)
• LayoutTests/fast/canvas/canvas-resize-reset.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/CanvasRenderingContext2D.cpp (modified) (2 diffs)
• WebCore/html/HTMLCanvasElement.cpp (modified) (7 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-07-07  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        Testcase for:
+        http://bugs.webkit.org/show_bug.cgi?id=8994
+        Canvas doesn't reset on resize
+
+        * fast/canvas/canvas-resize-reset-expected.checksum: Added.
+        * fast/canvas/canvas-resize-reset-expected.png: Added.
+        * fast/canvas/canvas-resize-reset-expected.txt: Added.
+        * fast/canvas/canvas-resize-reset.html: Added.
+
 2007-07-07  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-07  Rob Buis  <buis@kde.org>
+
+        Reviewed and tweaked by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=8994
+        Canvas doesn't reset on resize
+
+        Also reset the rendering context when resetting the canvas.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::reset):
+        (WebCore::HTMLCanvasElement::drawingContext):
+
 2007-07-07  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/html/CanvasRenderingContext2D.cpp

@@ -436 +436 @@
     if (!c)
         return;
+    if (state().m_path.isEmpty())
+        return;
     // FIXME: Do this through platform-independent GraphicsContext API.
 #if PLATFORM(CG)
@@ -472 +474 @@
     GraphicsContext* c = drawingContext();
     if (!c)
+        return;
+    if (state().m_path.isEmpty())
         return;
     // FIXME: Do this through platform-independent GraphicsContext API.

trunk/WebCore/html/HTMLCanvasElement.cpp

@@ -39 +39 @@
 #include "RenderHTMLCanvas.h"
 #include "Settings.h"
+#include <math.h>
 
 #if PLATFORM(QT)
@@ -45 +46 @@
 #endif
 
-#include <math.h>
-
-
 namespace WebCore {
 
@@ -53 +51 @@
 
 // These values come from the WhatWG spec.
-const int defaultWidth = 300;
-const int defaultHeight = 150;
+static const int defaultWidth = 300;
+static const int defaultHeight = 150;
 
 // Firefox limits width/height to 32767 pixels, but slows down dramatically before it 
-// reaches that limit we limit by area instead, giving us larger max dimensions, in exchange 
-// for reduce maximum canvas size.
-const float maxCanvasArea = 32768 * 8192; // Maximum canvas area in CSS pixels
+// reaches that limit. We limit by area instead, giving us larger maximum dimensions,
+// in exchange for a smaller maximum canvas size.
+static const float maxCanvasArea = 32768 * 8192; // Maximum canvas area in CSS pixels
 
 HTMLCanvasElement::HTMLCanvasElement(Document* doc)
@@ -178 +176 @@
     delete m_drawingContext;
     m_drawingContext = 0;
+    if (m_2DContext)
+        m_2DContext->reset();
 
     if (RenderObject* ro = renderer())
@@ -218 +218 @@
     float wf = ceilf(unscaledWidth * pageScaleFactor);
     float hf = ceilf(unscaledHeight * pageScaleFactor);
-    
+
     if (!(wf >= 1 && hf >= 1 && wf * hf <= maxCanvasArea))
         return;
-        
+
     unsigned w = static_cast<unsigned>(wf);
     unsigned h = static_cast<unsigned>(hf);
-    
+
+#if PLATFORM(CG)
     size_t bytesPerRow = w * 4;
     if (bytesPerRow / 4 != w) // check for overflow
         return;
-#if PLATFORM(CG)
     m_data = fastCalloc(h, bytesPerRow);
-#elif PLATFORM(QT)
-    m_data = new QPixmap(w, h);
-#endif
     if (!m_data)
         return;
-#if PLATFORM(CG)
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
     CGContextRef bitmapContext = CGBitmapContextCreate(m_data, w, h, 8, bytesPerRow, colorSpace, kCGImageAlphaPremultipliedLast);
@@ -243 +239 @@
     CGContextRelease(bitmapContext);
 #elif PLATFORM(QT)
+    m_data = new QPixmap(w, h);
+    if (!m_data)
+        return;
     m_data->fill(Qt::white);
     m_painter = new QPainter(m_data);
@@ -263 +262 @@
     if (!context)
         return 0;
-    
+
     CGContextRef contextRef = context->platformContext();
     if (!contextRef)
         return 0;
-    
+
     CGContextFlush(contextRef);
-    
+
     return CGBitmapContextCreateImage(contextRef);
 }
-#elif PLATFORM(QT)
+
+#elif PLATFORM(QT)
+
 QPixmap HTMLCanvasElement::createPlatformImage() const
 {