[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

tonikitoo at webkit.org tonikitoo at webkit.org
Thu Apr 8 02:10:23 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 57d056fdaf9b1de64efeb07507e1068478e8d800
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 21:52:45 2010 +0000

    Unreviewed attempt to fix Windows build.
    
    * page/SpatialNavigation.cpp:
    (WebCore::spatialDistance):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0810eaa..b07116e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-04  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Unreviewed attempt to fix Windows build.
+
+        * page/SpatialNavigation.cpp:
+        (WebCore::spatialDistance):
+
 2010-03-04  Simon Fraser  <simon.fraser at apple.com>
 
         Build fix.
diff --git a/WebCore/page/SpatialNavigation.cpp b/WebCore/page/SpatialNavigation.cpp
index 9825d64..4c4fafa 100644
--- a/WebCore/page/SpatialNavigation.cpp
+++ b/WebCore/page/SpatialNavigation.cpp
@@ -386,7 +386,11 @@ static long long spatialDistance(FocusDirection direction, const IntRect& a, con
     long long dy = y1 - y2;
 
     long long distance = (dx * dx) + (dy * dy);
-    return abs(distance);
+
+    if (distance < 0)
+        distance *= -1;
+
+    return distance;
 }
 
 static bool isRectInDirection(FocusDirection direction, const IntRect& curRect, const IntRect& targetRect)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list