[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3940aabe5fd6f19cf90f9dc6652351fbe81f9d86
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 22 15:35:01 2010 +0000

    2010-10-22  Andreas Kling  <kling at 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 at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70307 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 91bf6b9..e6ec99b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-22  Andreas Kling  <kling at 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 at gmail.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 34a6d40..9579674 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5615,7 +5615,6 @@ canvas/philip/tests/2d.path.arc.zeroradius.html
 canvas/philip/tests/2d.path.arcTo.collinear.2.html
 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
 canvas/philip/tests/2d.pattern.paint.repeatx.coord1.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e7336fe..8bbcd3b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-22  Andreas Kling  <kling at 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 at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/platform/graphics/cairo/PathCairo.cpp b/WebCore/platform/graphics/cairo/PathCairo.cpp
index d5045be..03f1d10 100644
--- a/WebCore/platform/graphics/cairo/PathCairo.cpp
+++ b/WebCore/platform/graphics/cairo/PathCairo.cpp
@@ -274,6 +274,8 @@ FloatRect Path::strokeBoundingRect(StrokeStyleApplier* applier)
 
 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);
     cairo_set_fill_rule(cr, rule == RULE_EVENODD ? CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING);

-- 
WebKit Debian packaging