[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 480273c98c5de0d9faabd19c76627db0d3415bfe
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 14:13:43 2010 +0000

    Some minor code clean ups in SpatialNavigation.cpp
    
    Rubber-stamped by Holger Freyther.
    Patch by Antonio Gomes <tonikitoo at webkit.org>
    
    * page/SpatialNavigation.cpp:
    (WebCore::distanceInDirection):
    (WebCore::deflateIfOverlapped):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8458bbf..4b71910 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-11  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Rubber-stamped by Holger Freyther.
+        Patch by Antonio Gomes <tonikitoo at webkit.org>
+
+        Some minor code clean ups in SpatialNavigation.cpp
+
+        * page/SpatialNavigation.cpp:
+        (WebCore::distanceInDirection):
+        (WebCore::deflateIfOverlapped):
+
 2010-03-13  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/page/SpatialNavigation.cpp b/WebCore/page/SpatialNavigation.cpp
index c7f16ae..6b34aab 100644
--- a/WebCore/page/SpatialNavigation.cpp
+++ b/WebCore/page/SpatialNavigation.cpp
@@ -64,8 +64,8 @@ long long distanceInDirection(Node* start, Node* dest, FocusDirection direction,
     // deflate both.
     deflateIfOverlapped(curRect, targetRect);
 
-    if ((curRect.isEmpty() || targetRect.isEmpty())
-        || (targetRect.x() < 0 || targetRect.y() < 0))
+    if (curRect.isEmpty() || targetRect.isEmpty()
+        || targetRect.x() < 0 || targetRect.y() < 0)
         return maxDistance();
 
     if (!isRectInDirection(direction, curRect, targetRect))
@@ -86,7 +86,7 @@ long long distanceInDirection(Node* start, Node* dest, FocusDirection direction,
     // FIXME_tonikitoo: simplify the logic here !
     if (alignment != None
         || (candidate.node && candidate.parentAlignment >= alignment
-        && (dest->document() == candidate.node->document())
+        && (candidate.node->document() == dest->document())
         && alignment > None)) {
 
         // If we are now in an higher precedent case, lets reset the current |candidate|'s
@@ -482,10 +482,10 @@ static void deflateIfOverlapped(IntRect& a, IntRect& b)
     static const int fudgeFactor = -2;
 
     // Avoid negative width or height values.
-    if (fudgeFactor > 0 || ((a.width() + 2 * fudgeFactor > 0) && (a.height() + 2 * fudgeFactor > 0)))
+    if ((a.width() + 2 * fudgeFactor > 0) && (a.height() + 2 * fudgeFactor > 0))
         a.inflate(fudgeFactor);
 
-    if (fudgeFactor > 0 || ((b.width() + 2 * fudgeFactor > 0) && (b.height() + 2 * fudgeFactor > 0)))
+    if ((b.width() + 2 * fudgeFactor > 0) && (b.height() + 2 * fudgeFactor > 0))
         b.inflate(fudgeFactor);
 }
 

-- 
WebKit Debian packaging