Changeset 70307 in webkit

Timestamp:

Oct 22, 2010 8:35:01 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-22 Andreas Kling <​kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Gtk] Fix canvas/philip/tests/2d.path.isPointInPath.nonfinite.html
​https://bugs.webkit.org/show_bug.cgi?id=48133

• platform/gtk/Skipped: Unskip the now passing test.

2010-10-22 Andreas Kling <​kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Gtk] Fix canvas/philip/tests/2d.path.isPointInPath.nonfinite.html
​https://bugs.webkit.org/show_bug.cgi?id=48133

• platform/graphics/cairo/PathCairo.cpp: (WebCore::Path::contains): Return false if any x or y are nonfinite.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/cairo/PathCairo.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-22  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Gtk] Fix canvas/philip/tests/2d.path.isPointInPath.nonfinite.html
+        https://bugs.webkit.org/show_bug.cgi?id=48133
+
+        * platform/gtk/Skipped: Unskip the now passing test.
+
 2010-10-22  François Sausset  <sausset@gmail.com>
 

trunk/LayoutTests/platform/gtk/Skipped

@@ -5616 +5616 @@
 canvas/philip/tests/2d.path.arcTo.collinear.3.html
 canvas/philip/tests/2d.path.closePath.nextpoint.html
-canvas/philip/tests/2d.path.isPointInPath.nonfinite.html
 canvas/philip/tests/2d.path.rect.selfintersect.html
 canvas/philip/tests/2d.path.rect.zero.6.html

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-22  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Gtk] Fix canvas/philip/tests/2d.path.isPointInPath.nonfinite.html
+        https://bugs.webkit.org/show_bug.cgi?id=48133
+
+        * platform/graphics/cairo/PathCairo.cpp:
+        (WebCore::Path::contains): Return false if any x or y are nonfinite.
+
 2010-10-22  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/platform/graphics/cairo/PathCairo.cpp

@@ -275 +275 @@
 bool Path::contains(const FloatPoint& point, WindRule rule) const
 {
+    if (!isfinite(point.x()) || !isfinite(point.y()))
+        return false;
     cairo_t* cr = platformPath()->context();
     cairo_fill_rule_t cur = cairo_get_fill_rule(cr);