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

[tonikitoo at webkit.org]

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

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e146e49..eed2463 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-04  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Unreviewed attempt to (again) fix Mac build.
+
+        * page/SpatialNavigation.cpp:
+        (WebCore::spatialDistance):
+
 2010-03-04  Dan Bernstein  <mitz at apple.com>
 
         Based on a patch from Nick Jong.
diff --git a/WebCore/page/SpatialNavigation.cpp b/WebCore/page/SpatialNavigation.cpp
index f9a4cad..9825d64 100644
--- a/WebCore/page/SpatialNavigation.cpp
+++ b/WebCore/page/SpatialNavigation.cpp
@@ -39,8 +39,6 @@
 
 namespace WebCore {
 
-using namespace std;
-
 static long long spatialDistance(FocusDirection, const IntRect&, const IntRect&);
 static IntRect renderRectRelativeToRootDocument(RenderObject*);
 static RectsAlignment alignmentForRects(FocusDirection, const IntRect&, const IntRect&);
@@ -384,7 +382,10 @@ static long long spatialDistance(FocusDirection direction, const IntRect& a, con
         }
     }
 
-    long long distance = pow((x1 - x2), 2) + pow((y1 - y2), 2);
+    long long dx = x1 - x2;
+    long long dy = y1 - y2;
+
+    long long distance = (dx * dx) + (dy * dy);
     return abs(distance);
 }
 

-- 
WebKit Debian packaging