Changeset 87019 in webkit

Timestamp:

May 21, 2011 8:30:02 AM (13 years ago)

Author:

eae@chromium.org

Message:

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

Reviewed by Eric Seidel.

Change RenderLineBoxList::hitTest to use IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=61156

Change the RenderLineBoxList hit testing to use IntPoint and clean up the rect calculation.

Covered by existing tests.

• rendering/RenderBlock.cpp: (WebCore::RenderBlock::hitTestContents):
• rendering/RenderInline.cpp: (WebCore::RenderInline::nodeAtPoint):
• rendering/RenderLineBoxList.cpp: (WebCore::RenderLineBoxList::hitTest):
• rendering/RenderLineBoxList.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-21  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Change RenderLineBoxList::hitTest to use IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=61156
+
+        Change the RenderLineBoxList hit testing to use IntPoint and clean up the rect calculation.
+
+        Covered by existing tests.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::hitTestContents):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::nodeAtPoint):
+        * rendering/RenderLineBoxList.cpp:
+        (WebCore::RenderLineBoxList::hitTest):
+        * rendering/RenderLineBoxList.h:
+
 2011-05-21  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4036 +4036 @@
     if (childrenInline() && !isTable()) {
         // We have to hit-test our line boxes.
-        if (m_lineBoxes.hitTest(this, request, result, x, y, tx, ty, hitTestAction))
+        if (m_lineBoxes.hitTest(this, request, result, IntPoint(x, y), tx, ty, hitTestAction))
             return true;
     } else {

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -715 +715 @@
                                 const IntPoint& pointInContainer, int tx, int ty, HitTestAction hitTestAction)
 {
-    return m_lineBoxes.hitTest(this, request, result, pointInContainer.x(), pointInContainer.y(), tx, ty, hitTestAction);
+    return m_lineBoxes.hitTest(this, request, result, pointInContainer, tx, ty, hitTestAction);
 }
 

trunk/Source/WebCore/rendering/RenderLineBoxList.cpp

@@ -275 +275 @@
 
 
-bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestRequest& request, HitTestResult& result, int x, int y, int tx, int ty, HitTestAction hitTestAction) const
+bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestRequest& request, HitTestResult& result, const IntPoint& pointInContainer, int tx, int ty, HitTestAction hitTestAction) const
 {
     if (hitTestAction != HitTestForeground)
@@ -286 +286 @@
         return false;
 
-    bool isHorizontal = firstLineBox()->isHorizontal();
-    
-    int logicalPointStart = isHorizontal ? y - result.topPadding() : x - result.leftPadding();
-    int logicalPointEnd = (isHorizontal ? y + result.bottomPadding() : x + result.rightPadding()) + 1;
-    IntRect rect(isHorizontal ? x : logicalPointStart, isHorizontal ? logicalPointStart : y,
-                 isHorizontal ? 1 : logicalPointEnd - logicalPointStart,
-                 isHorizontal ? logicalPointEnd - logicalPointStart : 1);    
+    IntRect rect = firstLineBox()->isHorizontal() ?
+        IntRect(pointInContainer.x(), pointInContainer.y() - result.topPadding(), 1, result.topPadding() + result.bottomPadding() + 1) :
+        IntRect(pointInContainer.x() - result.leftPadding(), pointInContainer.y(), result.rightPadding() + result.leftPadding() + 1, 1);
+
     if (!anyLineIntersectsRect(renderer, rect, tx, ty))
         return false;
@@ -302 +299 @@
         RootInlineBox* root = curr->root();
         if (rangeIntersectsRect(renderer, curr->logicalTopVisualOverflow(root->lineTop()), curr->logicalBottomVisualOverflow(root->lineBottom()), rect, tx, ty)) {
-            bool inside = curr->nodeAtPoint(request, result, IntPoint(x, y), tx, ty, root->lineTop(), root->lineBottom());
+            bool inside = curr->nodeAtPoint(request, result, pointInContainer, tx, ty, root->lineTop(), root->lineBottom());
             if (inside) {
-                renderer->updateHitTestResult(result, IntPoint(x - tx, y - ty));
+                renderer->updateHitTestResult(result, pointInContainer - IntSize(tx, ty));
                 return true;
             }

trunk/Source/WebCore/rendering/RenderLineBoxList.h

@@ -65 +65 @@
 
     void paint(RenderBoxModelObject*, PaintInfo&, int x, int y) const;
-    bool hitTest(RenderBoxModelObject*, const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction) const;
+    bool hitTest(RenderBoxModelObject*, const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty, HitTestAction) const;
     
 private: