Changeset 79129 in webkit

Timestamp:

Feb 19, 2011 12:28:47 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-19 Zan Dobersek <​zandobersek@gmail.com>

Reviewed by Martin Robinson.

[cairo][canvas] Drawing from/into float rectangles with width or height in range 0 to 1 fails
​https://bugs.webkit.org/show_bug.cgi?id=54491

Enable another passing test after fixing float values rounding.

• platform/gtk/Skipped:

2011-02-19 Zan Dobersek <​zandobersek@gmail.com>

Reviewed by Martin Robinson.

[cairo][canvas] Drawing from/into float rectangles with width or height in range 0 to 1 fails
​https://bugs.webkit.org/show_bug.cgi?id=54491

When width or height in float rectangle are in range (0, 0.5) or (-0.5, 0)
and would round to 0, alter the behaviour to ensure that width or height are
at least 1 pixel in size in these cases.

• platform/graphics/cairo/GraphicsContextCairo.cpp: (WebCore::GraphicsContext::roundToDevicePixels):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-02-19  Zan Dobersek  <zandobersek@gmail.com>
+
+        Reviewed by Martin Robinson.
+
+        [cairo][canvas] Drawing from/into float rectangles with width or height in range 0 to 1 fails
+        https://bugs.webkit.org/show_bug.cgi?id=54491
+
+        Enable another passing test after fixing float values rounding.
+
+        * platform/gtk/Skipped:
+
 2011-02-19  Alejandro G. Castro  <alex@igalia.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -1020 +1020 @@
 # These tests are failing for us, but not for Mac. This likely
 # indicates platform specific problems.
-canvas/philip/tests/2d.drawImage.floatsource.html
 canvas/philip/tests/2d.drawImage.self.2.html
 canvas/philip/tests/2d.path.arc.selfintersect.1.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-19  Zan Dobersek  <zandobersek@gmail.com>
+
+        Reviewed by Martin Robinson.
+
+        [cairo][canvas] Drawing from/into float rectangles with width or height in range 0 to 1 fails
+        https://bugs.webkit.org/show_bug.cgi?id=54491
+
+        When width or height in float rectangle are in range (0, 0.5) or (-0.5, 0)
+        and would round to 0, alter the behaviour to ensure that width or height are
+        at least 1 pixel in size in these cases.
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::roundToDevicePixels):
+
 2011-02-19  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -39 +39 @@
 #include "CairoUtilities.h"
 #include "ContextShadow.h"
+#include "FloatConversion.h"
 #include "FloatRect.h"
 #include "Font.h"
@@ -757 +758 @@
     y = round(y);
     cairo_device_to_user(cr, &x, &y);
-    result.setX(static_cast<float>(x));
-    result.setY(static_cast<float>(y));
-    x = frect.width();
-    y = frect.height();
-    cairo_user_to_device_distance(cr, &x, &y);
-    x = round(x);
-    y = round(y);
-    cairo_device_to_user_distance(cr, &x, &y);
-    result.setWidth(static_cast<float>(x));
-    result.setHeight(static_cast<float>(y));
+    result.setX(narrowPrecisionToFloat(x));
+    result.setY(narrowPrecisionToFloat(y));
+
+    // We must ensure width and height are at least 1 (or -1) when
+    // we're given float values in the range between 0 and 1 (or -1 and 0).
+    double width = frect.width();
+    double height = frect.height();
+    cairo_user_to_device_distance(cr, &width, &height);
+    if (width > -1 && width < 0)
+        width = -1;
+    else if (width > 0 && width < 1)
+        width = 1;
+    else
+        width = round(width);
+    if (height > -1 && width < 0)
+        height = -1;
+    else if (height > 0 && height < 1)
+        height = 1;
+    else
+        height = round(height);
+    cairo_device_to_user_distance(cr, &width, &height);
+    result.setWidth(narrowPrecisionToFloat(width));
+    result.setHeight(narrowPrecisionToFloat(height));
+
     return result;
 }