Changeset 88195 in webkit

Timestamp:

Jun 6, 2011 3:13:08 PM (13 years ago)

Author:

eae@chromium.org

Message:

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

Reviewed by Eric Seidel.

Convert hitTest to IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62144

Covered by existing tests.

• rendering/InlineBox.cpp: (WebCore::InlineBox::nodeAtPoint):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::hitTestFloats): (WebCore::RenderBlock::hitTestContents):
• rendering/RenderInline.cpp: (WebCore::RenderInline::nodeAtPoint):
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::hitTestContents):
• rendering/RenderLayer.h: (WebCore::RenderLayer::renderBoxLocation): (WebCore::RenderLayer::renderBoxX): (WebCore::RenderLayer::renderBoxY):
• rendering/RenderLineBoxList.cpp: (WebCore::RenderLineBoxList::hitTest):
• rendering/RenderLineBoxList.h:
• rendering/RenderObject.cpp: (WebCore::RenderObject::hitTest):
• rendering/RenderObject.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-06  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Convert hitTest to IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62144
+
+        Covered by existing tests.
+
+        * rendering/InlineBox.cpp:
+        (WebCore::InlineBox::nodeAtPoint):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::hitTestFloats):
+        (WebCore::RenderBlock::hitTestContents):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::nodeAtPoint):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::hitTestContents):
+        * rendering/RenderLayer.h:
+        (WebCore::RenderLayer::renderBoxLocation):
+        (WebCore::RenderLayer::renderBoxX):
+        (WebCore::RenderLayer::renderBoxY):
+        * rendering/RenderLineBoxList.cpp:
+        (WebCore::RenderLineBoxList::hitTest):
+        * rendering/RenderLineBoxList.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::hitTest):
+        * rendering/RenderObject.h:
+
 2011-06-06  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/rendering/InlineBox.cpp

@@ -226 +226 @@
     // own stacking context.  (See Appendix E.2, section 6.4 on inline block/table elements in the CSS2.1
     // specification.)
-    return renderer()->hitTest(request, result, pointInContainer, tx, ty);
+    return renderer()->hitTest(request, result, pointInContainer, IntPoint(tx, ty));
 }
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3974 +3974 @@
             int yOffset = yPositionForFloatIncludingMargin(floatingObject) - floatingObject->m_renderer->y();
             IntPoint childPoint = flipFloatForWritingMode(floatingObject, IntPoint(tx + xOffset, ty + yOffset));
-            if (floatingObject->m_renderer->hitTest(request, result, pointInContainer, childPoint.x(), childPoint.y())) {
+            if (floatingObject->m_renderer->hitTest(request, result, pointInContainer, childPoint)) {
                 updateHitTestResult(result, pointInContainer - toSize(childPoint));
                 return true;
@@ -4035 +4035 @@
     if (childrenInline() && !isTable()) {
         // We have to hit-test our line boxes.
-        if (m_lineBoxes.hitTest(this, request, result, pointInContainer, tx, ty, hitTestAction))
+        if (m_lineBoxes.hitTest(this, request, result, pointInContainer, IntPoint(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, tx, ty, hitTestAction);
+    return m_lineBoxes.hitTest(this, request, result, pointInContainer, IntPoint(tx, ty), hitTestAction);
 }
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3138 +3138 @@
 {
     if (!renderer()->hitTest(request, result, hitTestPoint,
-                            layerBounds.x() - renderBoxX(),
-                            layerBounds.y() - renderBoxY(), 
+                            toPoint(layerBounds.location() - renderBoxLocation()),
                             hitTestFilter)) {
         // It's wrong to set innerNode, but then claim that you didn't hit anything, unless it is

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -460 +460 @@
     void setLastChild(RenderLayer* last) { m_last = last; }
 
-    int renderBoxX() const { return renderer()->isBox() ? toRenderBox(renderer())->x() : 0; }
-    int renderBoxY() const { return renderer()->isBox() ? toRenderBox(renderer())->y() : 0; }
+    IntPoint renderBoxLocation() const { return renderer()->isBox() ? toRenderBox(renderer())->location() : IntPoint(); }
+    int renderBoxX() const { return renderBoxLocation().x(); }
+    int renderBoxY() const { return renderBoxLocation().y(); }
 
     void collectLayers(Vector<RenderLayer*>*&, Vector<RenderLayer*>*&);

trunk/Source/WebCore/rendering/RenderLineBoxList.cpp

@@ -275 +275 @@
 
 
-bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestRequest& request, HitTestResult& result, const IntPoint& pointInContainer, int tx, int ty, HitTestAction hitTestAction) const
+bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestRequest& request, HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction hitTestAction) const
 {
     if (hitTestAction != HitTestForeground)
@@ -290 +290 @@
         IntRect(pointInContainer.x() - result.leftPadding(), pointInContainer.y(), result.rightPadding() + result.leftPadding() + 1, 1);
 
-    if (!anyLineIntersectsRect(renderer, rect, IntPoint(tx, ty)))
+    if (!anyLineIntersectsRect(renderer, rect, accumulatedOffset))
         return false;
 
@@ -298 +298 @@
     for (InlineFlowBox* curr = lastLineBox(); curr; curr = curr->prevLineBox()) {
         RootInlineBox* root = curr->root();
-        if (rangeIntersectsRect(renderer, curr->logicalTopVisualOverflow(root->lineTop()), curr->logicalBottomVisualOverflow(root->lineBottom()), rect, IntPoint(tx, ty))) {
-            bool inside = curr->nodeAtPoint(request, result, pointInContainer, tx, ty, root->lineTop(), root->lineBottom());
+        if (rangeIntersectsRect(renderer, curr->logicalTopVisualOverflow(root->lineTop()), curr->logicalBottomVisualOverflow(root->lineBottom()), rect, accumulatedOffset)) {
+            bool inside = curr->nodeAtPoint(request, result, pointInContainer, accumulatedOffset.x(), accumulatedOffset.y(), root->lineTop(), root->lineBottom());
             if (inside) {
-                renderer->updateHitTestResult(result, pointInContainer - IntSize(tx, ty));
+                renderer->updateHitTestResult(result, toPoint(pointInContainer - accumulatedOffset));
                 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&, const IntPoint& pointInContainer, int tx, int ty, HitTestAction) const;
+    bool hitTest(RenderBoxModelObject*, const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestAction) const;
     
 private:

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -2143 +2143 @@
 }
 
-bool RenderObject::hitTest(const HitTestRequest& request, HitTestResult& result, const IntPoint& pointInContainer, int tx, int ty, HitTestFilter hitTestFilter)
+bool RenderObject::hitTest(const HitTestRequest& request, HitTestResult& result, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestFilter hitTestFilter)
 {
     bool inside = false;
     if (hitTestFilter != HitTestSelf) {
         // First test the foreground layer (lines and inlines).
-        inside = nodeAtPoint(request, result, pointInContainer, tx, ty, HitTestForeground);
+        inside = nodeAtPoint(request, result, pointInContainer, accumulatedOffset.x(), accumulatedOffset.y(), HitTestForeground);
 
         // Test floats next.
         if (!inside)
-            inside = nodeAtPoint(request, result, pointInContainer, tx, ty, HitTestFloat);
+            inside = nodeAtPoint(request, result, pointInContainer, accumulatedOffset.x(), accumulatedOffset.y(), HitTestFloat);
 
         // Finally test to see if the mouse is in the background (within a child block's background).
         if (!inside)
-            inside = nodeAtPoint(request, result, pointInContainer, tx, ty, HitTestChildBlockBackgrounds);
+            inside = nodeAtPoint(request, result, pointInContainer, accumulatedOffset.x(), accumulatedOffset.y(), HitTestChildBlockBackgrounds);
     }
 
     // See if the mouse is inside us but not any of our descendants
     if (hitTestFilter != HitTestDescendants && !inside)
-        inside = nodeAtPoint(request, result, pointInContainer, tx, ty, HitTestBlockBackground);
+        inside = nodeAtPoint(request, result, pointInContainer, accumulatedOffset.x(), accumulatedOffset.y(), HitTestBlockBackground);
 
     return inside;

trunk/Source/WebCore/rendering/RenderObject.h

@@ -546 +546 @@
 #endif
 
-    bool hitTest(const HitTestRequest&, HitTestResult&, const IntPoint&, int tx, int ty, HitTestFilter = HitTestAll);
+    bool hitTest(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, const IntPoint& accumulatedOffset, HitTestFilter = HitTestAll);
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const IntPoint& pointInContainer, int tx, int ty, HitTestAction);
     virtual void updateHitTestResult(HitTestResult&, const IntPoint&);