Changeset 88311 in webkit

Timestamp:

Jun 7, 2011 6:46:17 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-06-07 Emil A Eklund <​eae@chromium.org>

Reviewed by Eric Seidel.

Change RenderBlock::hitTestColumns to IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62172

Covered by existing tests.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::nodeAtPoint): (WebCore::RenderBlock::hitTestColumns):
• rendering/RenderBlock.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (3 diffs)
• rendering/RenderBlock.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-07  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Change RenderBlock::hitTestColumns to IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62172
+
+        Covered by existing tests.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::nodeAtPoint):
+        (WebCore::RenderBlock::hitTestColumns):
+        * rendering/RenderBlock.h:
+
 2011-06-07  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3935 +3935 @@
             if (hitTestAction == HitTestFloat && hitTestFloats(request, result, pointInContainer, scrolledOffset.width(), scrolledOffset.height()))
                 return true;
-        } else if (hitTestColumns(request, result, pointInContainer, scrolledOffset.width(), scrolledOffset.height(), hitTestAction)) {
+        } else if (hitTestColumns(request, result, pointInContainer, toPoint(scrolledOffset), hitTestAction)) {
             updateHitTestResult(result, pointInContainer - localOffset);
             return true;
@@ -3983 +3983 @@
 }
 
-bool RenderBlock::hitTestColumns(const HitTestRequest& request, HitTestResult& result, const IntPoint& pointInContainer, int tx, int ty, HitTestAction hitTestAction)
+bool RenderBlock::hitTestColumns(const HitTestRequest& request, HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction hitTestAction)
 {
     // We need to do multiple passes, breaking up our hit testing into strips.
@@ -4011 +4011 @@
         else
             currLogicalTopOffset += blockDelta;
-        colRect.move(tx, ty);
+        colRect.moveBy(accumulatedOffset);
         
         if (colRect.intersects(result.rectForPoint(pointInContainer))) {
             // The point is inside this column.
-            // Adjust tx and ty to change where we hit test.
+            // Adjust accumulatedOffset to change where we hit test.
         
             IntSize offset = isHorizontal ? IntSize(currLogicalLeftOffset, currLogicalTopOffset) : IntSize(currLogicalTopOffset, currLogicalLeftOffset);
-            int finalX = tx + offset.width();
-            int finalY = ty + offset.height();
+            IntPoint finalLocation = accumulatedOffset + offset;
             if (result.isRectBasedTest() && !colRect.contains(result.rectForPoint(pointInContainer)))
-                hitTestContents(request, result, pointInContainer, IntPoint(finalX, finalY), hitTestAction);
+                hitTestContents(request, result, pointInContainer, finalLocation, hitTestAction);
             else
-                return hitTestContents(request, result, pointInContainer, IntPoint(finalX, finalY), hitTestAction) || (hitTestAction == HitTestFloat && hitTestFloats(request, result, pointInContainer, finalX, finalY));
+                return hitTestContents(request, result, pointInContainer, finalLocation, hitTestAction) || (hitTestAction == HitTestFloat && hitTestFloats(request, result, pointInContainer, finalLocation.x(), finalLocation.y()));
         }
     }

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -589 +589 @@
     int nextFloatLogicalBottomBelow(int) const;
     
-    virtual bool hitTestColumns(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty, HitTestAction);
+    virtual bool hitTestColumns(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
     virtual bool hitTestContents(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction);
     bool hitTestFloats(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty);