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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 37ca3fd408db6eced5030e6e60755c86699ae217
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 10:48:38 2010 +0000

    2010-09-08  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Andreas Kling.
    
            Fix warning in rendering/RenderBlock.cpp.
            https://bugs.webkit.org/show_bug.cgi?id=45373
    
            * rendering/RenderBlock.cpp:
            (WebCore::RenderBlock::hitTestColumns): Suggested parentheses added around && within ||
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66965 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5081c01..a00981c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-08  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Fix warning in rendering/RenderBlock.cpp.
+        https://bugs.webkit.org/show_bug.cgi?id=45373
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::hitTestColumns): Suggested parentheses added around && within ||
+
 2010-09-08  Mario Sanchez Prada  <msanchez at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 51a200f..e507699 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -3870,7 +3870,7 @@ bool RenderBlock::hitTestColumns(const HitTestRequest& request, HitTestResult& r
             if (result.isRectBasedTest() && !colRect.contains(result.rectFromPoint(x, y)))
                 hitTestContents(request, result, x, y, finalX, finalY, hitTestAction);
             else
-                return hitTestContents(request, result, x, y, finalX, finalY, hitTestAction) || hitTestAction == HitTestFloat && hitTestFloats(request, result, x, y, finalX, finalY);
+                return hitTestContents(request, result, x, y, finalX, finalY, hitTestAction) || (hitTestAction == HitTestFloat && hitTestFloats(request, result, x, y, finalX, finalY));
         }
     }
 

-- 
WebKit Debian packaging