Changeset 73744 in webkit

Timestamp:

Dec 10, 2010 10:47:54 AM (13 years ago)

Author:

mihaip@chromium.org

Message:

2010-12-08 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Darin Adler.

fast/canvas/canvas-getImageData-negative-source.html fails on Mac
​https://bugs.webkit.org/show_bug.cgi?id=47901

Add test for rounding behavior. Remove now-passing tests from
test_expectations.txt.

• fast/canvas/canvas-getImageData-rounding-expected.txt: Added.
• fast/canvas/canvas-getImageData-rounding.html: Added.
• platform/chromium/test_expectations.txt:

2010-12-08 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Darin Adler.

fast/canvas/canvas-getImageData-negative-source.html fails on Mac
​https://bugs.webkit.org/show_bug.cgi?id=47901

Test: fast/canvas/canvas-getImageData-rounding.html

static_cast<unsigned> is generally not what we want in
convertLogicalToDevice. It produces inconsistent results when compiling
for 32-bit vs. 64-bit, and in any case we weren't getting correct
rounding behavior for source rectangles (e.g. we should get a source rect
of width 2 if the source X is 0.9 and the source width is 0.2, but we
were getting only one of width 1).

• html/HTMLCanvasElement.cpp: (WebCore::HTMLCanvasElement::convertLogicalToDevice): (WebCore::HTMLCanvasElement::convertToValidDeviceSize):
• html/HTMLCanvasElement.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/canvas-getImageData-rounding-expected.txt (added)
• LayoutTests/fast/canvas/canvas-getImageData-rounding.html (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLCanvasElement.cpp (modified) (1 diff)
• WebCore/html/HTMLCanvasElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-08  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        fast/canvas/canvas-getImageData-negative-source.html fails on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=47901
+        
+        Add test for rounding behavior. Remove now-passing tests from
+        test_expectations.txt.
+
+        * fast/canvas/canvas-getImageData-rounding-expected.txt: Added.
+        * fast/canvas/canvas-getImageData-rounding.html: Added.
+        * platform/chromium/test_expectations.txt:
+
 2010-12-10  Alejandro G. Castro  <alex@igalia.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -2416 +2416 @@
 BUGWK45991 MAC : canvas/philip/tests/2d.shadow.enable.y.html = TEXT
 BUGWK45991 MAC : canvas/philip/tests/2d.strokeRect.zero.4.html = TEXT
-BUGWK45991 MAC : canvas/philip/tests/2d.imageData.get.source.outside.html = TEXT
 BUGWK45991 WIN : canvas/philip/tests/2d.gradient.radial.touch2.html = TEXT
 BUGWK40147 : canvas/philip/tests/toDataURL.jpeg.alpha.html = TEXT
 BUG61824 : canvas/philip/tests/2d.pattern.image.string.html = TEXT
-
-// Failures after WebKit roll 70949:71000
-BUGWK45991 MAC : canvas/philip/tests/2d.imageData.get.source.negative.html = TEXT
 
 // Flaky tests
@@ -2924 +2920 @@
 
 BUG59647 WIN : svg/dom/length-list-parser.html = PASS CRASH
-
-BUGWK47901 MAC : fast/canvas/canvas-getImageData-negative-source.html = TEXT
 
 // We don't support layoutTestController.nodesFromRect so this test just times out

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-08  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        fast/canvas/canvas-getImageData-negative-source.html fails on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=47901
+
+        Test: fast/canvas/canvas-getImageData-rounding.html
+        
+        static_cast<unsigned> is generally not what we want in
+        convertLogicalToDevice. It produces inconsistent results when compiling
+        for 32-bit vs. 64-bit, and in any case we weren't getting correct
+        rounding behavior for source rectangles (e.g. we should get a source rect
+        of width 2 if the source X is 0.9 and the source width is 0.2, but we
+        were getting only one of width 1).
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::convertLogicalToDevice):
+        (WebCore::HTMLCanvasElement::convertToValidDeviceSize):
+        * html/HTMLCanvasElement.h:
+
 2010-12-10  Hironori Bono  <hbono@chromium.org>
 

trunk/WebCore/html/HTMLCanvasElement.cpp

@@ -323 +323 @@
 IntRect HTMLCanvasElement::convertLogicalToDevice(const FloatRect& logicalRect) const
 {
-    return IntRect(convertLogicalToDevice(logicalRect.location()), convertLogicalToDevice(logicalRect.size()));
+    float left = floorf(logicalRect.left() * m_pageScaleFactor);
+    float top = floorf(logicalRect.top() * m_pageScaleFactor);
+    float right = ceilf(logicalRect.right() * m_pageScaleFactor);
+    float bottom = ceilf(logicalRect.bottom() * m_pageScaleFactor);
+    
+    return IntRect(IntPoint(left, top), convertToValidDeviceSize(right - left, bottom - top));
 }
 
 IntSize HTMLCanvasElement::convertLogicalToDevice(const FloatSize& logicalSize) const
 {
-    float wf = ceilf(logicalSize.width() * m_pageScaleFactor);
-    float hf = ceilf(logicalSize.height() * m_pageScaleFactor);
-
-    if (!(wf >= 1 && hf >= 1 && wf * hf <= MaxCanvasArea))
+    return convertToValidDeviceSize(logicalSize.width() * m_pageScaleFactor, logicalSize.height() * m_pageScaleFactor);
+}
+
+IntSize HTMLCanvasElement::convertToValidDeviceSize(float width, float height) const
+{
+    width = ceilf(width);
+    height = ceilf(height);
+    
+    if (width < 1 || height < 1 || width * height > MaxCanvasArea)
         return IntSize();
 
 #if PLATFORM(SKIA)
-    if (wf > MaxSkiaDim || hf > MaxSkiaDim)
+    if (width > MaxSkiaDim || height > MaxSkiaDim)
         return IntSize();
 #endif
 
-    return IntSize(static_cast<unsigned>(wf), static_cast<unsigned>(hf));
-}
-
-IntPoint HTMLCanvasElement::convertLogicalToDevice(const FloatPoint& logicalPos) const
-{
-    float xf = logicalPos.x() * m_pageScaleFactor;
-    float yf = logicalPos.y() * m_pageScaleFactor;
-
-    return IntPoint(static_cast<unsigned>(xf), static_cast<unsigned>(yf));
+    return IntSize(width, height);
 }
 

trunk/WebCore/html/HTMLCanvasElement.h

@@ -108 +108 @@
     IntRect convertLogicalToDevice(const FloatRect&) const;
     IntSize convertLogicalToDevice(const FloatSize&) const;
-    IntPoint convertLogicalToDevice(const FloatPoint&) const;
+    IntSize convertToValidDeviceSize(float width, float height) const;
 
     const SecurityOrigin& securityOrigin() const;