Changeset 87018 in webkit

Timestamp:

May 21, 2011 6:54:31 AM (13 years ago)

Author:

eae@chromium.org

Message:

2011-05-21 Emil A Eklund <​eae@chromium.org>

Reviewed by Eric Seidel.

Change HitTestResult to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=61230

Covered by existing tests.

• rendering/EllipsisBox.cpp: (WebCore::EllipsisBox::nodeAtPoint):
• rendering/HitTestResult.cpp: (WebCore::HitTestResult::addNodeToRectBasedTestResult):
• rendering/HitTestResult.h: (WebCore::HitTestResult::isRectBasedTest):
• rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::nodeAtPoint):
• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::nodeAtPoint):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::nodeAtPoint): (WebCore::RenderBlock::hitTestColumns):
• rendering/RenderBox.cpp: (WebCore::RenderBox::nodeAtPoint):
• rendering/RenderTable.cpp: (WebCore::RenderTable::nodeAtPoint):
• rendering/svg/RenderSVGRoot.cpp: (WebCore::RenderSVGRoot::nodeAtPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/EllipsisBox.cpp (modified) (1 diff)
• rendering/HitTestResult.cpp (modified) (3 diffs)
• rendering/HitTestResult.h (modified) (3 diffs)
• rendering/InlineFlowBox.cpp (modified) (1 diff)
• rendering/InlineTextBox.cpp (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (4 diffs)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (1 diff)
• rendering/svg/RenderSVGRoot.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-21  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Change HitTestResult to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=61230
+
+        Covered by existing tests.
+
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::nodeAtPoint):
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::addNodeToRectBasedTestResult):
+        * rendering/HitTestResult.h:
+        (WebCore::HitTestResult::isRectBasedTest):
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::nodeAtPoint):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::nodeAtPoint):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::nodeAtPoint):
+        (WebCore::RenderBlock::hitTestColumns):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::nodeAtPoint):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::nodeAtPoint):
+        * rendering/svg/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::nodeAtPoint):
+
 2011-05-21  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Source/WebCore/rendering/EllipsisBox.cpp

@@ -119 +119 @@
     if (visibleToHitTesting() && boundsRect.intersects(result.rectForPoint(pointInContainer))) {
         renderer()->updateHitTestResult(result, pointInContainer - IntSize(tx, ty));
-        if (!result.addNodeToRectBasedTestResult(renderer()->node(), pointInContainer.x(), pointInContainer.y(), boundsRect))
+        if (!result.addNodeToRectBasedTestResult(renderer()->node(), pointInContainer, boundsRect))
             return true;
     }

trunk/Source/WebCore/rendering/HitTestResult.cpp

@@ -509 +509 @@
 }
 
-bool HitTestResult::addNodeToRectBasedTestResult(Node* node, int x, int y, const IntRect& rect)
+bool HitTestResult::addNodeToRectBasedTestResult(Node* node, const IntPoint& pointInContainer, const IntRect& rect)
 {
     // If it is not a rect-based hit test, this method has to be no-op.
@@ -537 +537 @@
         }
     }
-    return !rect.contains(rectForPoint(x, y));
-}
-
-bool HitTestResult::addNodeToRectBasedTestResult(Node* node, int x, int y, const FloatRect& rect)
+    return !rect.contains(rectForPoint(pointInContainer));
+}
+
+bool HitTestResult::addNodeToRectBasedTestResult(Node* node, const IntPoint& pointInContainer, const FloatRect& rect)
 {
     // If it is not a rect-based hit test, this method has to be no-op.
@@ -568 +568 @@
         }
     }
-    return !rect.contains(rectForPoint(x, y));
+    return !rect.contains(rectForPoint(pointInContainer));
 }
 

trunk/Source/WebCore/rendering/HitTestResult.h

@@ -104 +104 @@
     // Rect-based hit test related methods.
     bool isRectBasedTest() const { return m_isRectBased; }
-    IntRect rectForPoint(int x, int y) const;
     IntRect rectForPoint(const IntPoint&) const;
     static IntRect rectForPoint(const IntPoint&, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding);
@@ -114 +113 @@
     // Returns true if it is rect-based hit test and needs to continue until the rect is fully
     // enclosed by the boundaries of a node.
-    bool addNodeToRectBasedTestResult(Node*, int x, int y, const IntRect& = IntRect());
-    bool addNodeToRectBasedTestResult(Node*, int x, int y, const FloatRect&);
+    bool addNodeToRectBasedTestResult(Node*, const IntPoint& pointInContainer, const IntRect& = IntRect());
+    bool addNodeToRectBasedTestResult(Node*, const IntPoint& pointInContainer, const FloatRect&);
     void append(const HitTestResult&);
 
@@ -146 +145 @@
 };
 
-inline IntRect HitTestResult::rectForPoint(int x, int y) const
-{
-    return rectForPoint(IntPoint(x, y), m_topPadding, m_rightPadding, m_bottomPadding, m_leftPadding);
-}
-
 // Formula:
 // x = p.x() - rightPadding

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -940 +940 @@
     if (visibleToHitTesting() && rect.intersects(result.rectForPoint(pointInContainer))) {
         renderer()->updateHitTestResult(result, flipForWritingMode(pointInContainer - IntSize(tx, ty))); // Don't add in m_x or m_y here, we want coords in the containing block's space.
-        if (!result.addNodeToRectBasedTestResult(renderer()->node(), pointInContainer.x(), pointInContainer.y(), rect))
+        if (!result.addNodeToRectBasedTestResult(renderer()->node(), pointInContainer, rect))
             return true;
     }

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -351 +351 @@
     if (m_truncation != cFullTruncation && visibleToHitTesting() && rect.intersects(result.rectForPoint(pointInContainer))) {
         renderer()->updateHitTestResult(result, flipForWritingMode(pointInContainer - IntSize(tx, ty)));
-        if (!result.addNodeToRectBasedTestResult(renderer()->node(), pointInContainer.x(), pointInContainer.y(), rect))
+        if (!result.addNodeToRectBasedTestResult(renderer()->node(), pointInContainer, rect))
             return true;
     }

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3913 +3913 @@
         updateHitTestResult(result, pointInContainer - localOffset);
         // FIXME: isPointInOverflowControl() doesn't handle rect-based tests yet.
-        if (!result.addNodeToRectBasedTestResult(node(), pointInContainer.x(), pointInContainer.y()))
+        if (!result.addNodeToRectBasedTestResult(node(), pointInContainer))
            return true;
     }
@@ -3948 +3948 @@
         if (visibleToHitTesting() && boundsRect.intersects(result.rectForPoint(pointInContainer))) {
             updateHitTestResult(result, flipForWritingMode(pointInContainer - localOffset));
-            if (!result.addNodeToRectBasedTestResult(node(), pointInContainer.x(), pointInContainer.y(), boundsRect))
+            if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, boundsRect))
                 return true;
         }
@@ -4015 +4015 @@
         colRect.move(tx, ty);
         
-        if (colRect.intersects(result.rectForPoint(x, y))) {
+        if (colRect.intersects(result.rectForPoint(IntPoint(x, y)))) {
             // The point is inside this column.
             // Adjust tx and ty to change where we hit test.
@@ -4022 +4022 @@
             int finalX = tx + offset.width();
             int finalY = ty + offset.height();
-            if (result.isRectBasedTest() && !colRect.contains(result.rectForPoint(x, y)))
+            if (result.isRectBasedTest() && !colRect.contains(result.rectForPoint(IntPoint(x, y))))
                 hitTestContents(request, result, x, y, finalX, finalY, hitTestAction);
             else

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -759 +759 @@
     if (visibleToHitTesting() && action == HitTestForeground && boundsRect.intersects(result.rectForPoint(pointInContainer))) {
         updateHitTestResult(result, pointInContainer - IntSize(tx, ty));
-        if (!result.addNodeToRectBasedTestResult(node(), pointInContainer.x(), pointInContainer.y(), boundsRect))
+        if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, boundsRect))
             return true;
     }

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -1217 +1217 @@
     if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(pointInContainer))) {
         updateHitTestResult(result, flipForWritingMode(pointInContainer - IntSize(tx, ty)));
-        if (!result.addNodeToRectBasedTestResult(node(), pointInContainer.x(), pointInContainer.y(), boundsRect))
+        if (!result.addNodeToRectBasedTestResult(node(), pointInContainer, boundsRect))
             return true;
     }

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

@@ -335 +335 @@
             updateHitTestResult(result, pointInBorderBox);
             // FIXME: nodeAtFloatPoint() doesn't handle rect-based hit tests yet.
-            result.addNodeToRectBasedTestResult(child->node(), pointInContainer.x(), pointInContainer.y());
+            result.addNodeToRectBasedTestResult(child->node(), pointInContainer);
             return true;
         }