Changeset 90698 in webkit

Timestamp:

Jul 10, 2011 12:20:37 PM (13 years ago)

Author:

eae@chromium.org

Message:

Switch updateHitTestResult to to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=64209

Reviewed by Eric Seidel.

No new tests, no functionality changes.

• rendering/EllipsisBox.cpp:

(WebCore::EllipsisBox::nodeAtPoint):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::hitTestFloats):
(WebCore::RenderBlock::updateHitTestResult):

• rendering/RenderBlock.h:
• rendering/RenderInline.cpp:

(WebCore::RenderInline::updateHitTestResult):

• rendering/RenderInline.h:
• rendering/RenderLineBoxList.cpp:

(WebCore::RenderLineBoxList::hitTest):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::updateHitTestResult):

• rendering/RenderObject.h:
• rendering/RenderView.cpp:

(WebCore::RenderView::updateHitTestResult):

• rendering/RenderView.h:
• rendering/svg/RenderSVGContainer.cpp:

(WebCore::RenderSVGContainer::nodeAtFloatPoint):

• rendering/svg/RenderSVGImage.cpp:

(WebCore::RenderSVGImage::nodeAtFloatPoint):

• rendering/svg/RenderSVGPath.cpp:

(WebCore::RenderSVGPath::nodeAtFloatPoint):

• rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::nodeAtPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/EllipsisBox.cpp (modified) (2 diffs)
• rendering/RenderBlock.cpp (modified) (2 diffs)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (2 diffs)
• rendering/RenderInline.h (modified) (1 diff)
• rendering/RenderLineBoxList.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderView.cpp (modified) (1 diff)
• rendering/RenderView.h (modified) (1 diff)
• rendering/svg/RenderSVGContainer.cpp (modified) (1 diff)
• rendering/svg/RenderSVGImage.cpp (modified) (1 diff)
• rendering/svg/RenderSVGPath.cpp (modified) (1 diff)
• rendering/svg/RenderSVGRoot.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-10  Emil A Eklund  <eae@chromium.org>
+
+        Switch updateHitTestResult to to new layout types
+        https://bugs.webkit.org/show_bug.cgi?id=64209
+
+        Reviewed by Eric Seidel.
+
+        No new tests, no functionality changes.
+
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::nodeAtPoint):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::hitTestFloats):
+        (WebCore::RenderBlock::updateHitTestResult):
+        * rendering/RenderBlock.h:
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::updateHitTestResult):
+        * rendering/RenderInline.h:
+        * rendering/RenderLineBoxList.cpp:
+        (WebCore::RenderLineBoxList::hitTest):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::updateHitTestResult):
+        * rendering/RenderObject.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::updateHitTestResult):
+        * rendering/RenderView.h:
+        * rendering/svg/RenderSVGContainer.cpp:
+        (WebCore::RenderSVGContainer::nodeAtFloatPoint):
+        * rendering/svg/RenderSVGImage.cpp:
+        (WebCore::RenderSVGImage::nodeAtFloatPoint):
+        * rendering/svg/RenderSVGPath.cpp:
+        (WebCore::RenderSVGPath::nodeAtFloatPoint):
+        * rendering/svg/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::nodeAtPoint):
+
 2011-07-10  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/rendering/EllipsisBox.cpp

@@ -105 +105 @@
 bool EllipsisBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, int lineTop, int lineBottom)
 {
-    LayoutPoint adjustedLocation = accumulatedOffset + roundedIntPoint(topLeft());
+    LayoutPoint adjustedLocation = accumulatedOffset + roundedLayoutPoint(topLeft());
 
     // Hit test the markup box.
@@ -112 +112 @@
         LayoutUnit mtx = adjustedLocation.x() + m_logicalWidth - m_markupBox->x();
         LayoutUnit mty = adjustedLocation.y() + style->fontMetrics().ascent() - (m_markupBox->y() + m_markupBox->renderer()->style(m_firstLine)->fontMetrics().ascent());
-        if (m_markupBox->nodeAtPoint(request, result, pointInContainer, IntPoint(mtx, mty), lineTop, lineBottom)) {
-            renderer()->updateHitTestResult(result, pointInContainer - IntSize(mtx, mty));
+        if (m_markupBox->nodeAtPoint(request, result, pointInContainer, LayoutPoint(mtx, mty), lineTop, lineBottom)) {
+            renderer()->updateHitTestResult(result, pointInContainer - LayoutSize(mtx, mty));
             return true;
         }

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4024 +4024 @@
             LayoutPoint childPoint = flipFloatForWritingMode(floatingObject, adjustedLocation + LayoutSize(xOffset, yOffset));
             if (floatingObject->m_renderer->hitTest(request, result, pointInContainer, childPoint)) {
-                updateHitTestResult(result, pointInContainer - toSize(childPoint));
+                updateHitTestResult(result, pointInContainer - toLayoutSize(childPoint));
                 return true;
             }
@@ -5779 +5779 @@
 }
 
-void RenderBlock::updateHitTestResult(HitTestResult& result, const IntPoint& point)
+void RenderBlock::updateHitTestResult(HitTestResult& result, const LayoutPoint& point)
 {
     if (result.innerNode())

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -314 +314 @@
     virtual int lastLineBoxBaseline() const;
 
-    virtual void updateHitTestResult(HitTestResult&, const IntPoint&);
+    virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&);
 
     // Delay update scrollbar until finishDelayRepaint() will be

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1196 +1196 @@
 }
 
-void RenderInline::updateHitTestResult(HitTestResult& result, const IntPoint& point)
+void RenderInline::updateHitTestResult(HitTestResult& result, const LayoutPoint& point)
 {
     if (result.innerNode())
@@ -1202 +1202 @@
 
     Node* n = node();
-    IntPoint localPoint(point);
+    LayoutPoint localPoint(point);
     if (n) {
         if (isInlineElementContinuation()) {

trunk/Source/WebCore/rendering/RenderInline.h

@@ -151 +151 @@
     virtual void childBecameNonInline(RenderObject* child);
 
-    virtual void updateHitTestResult(HitTestResult&, const IntPoint&);
+    virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&);
 
     virtual void imageChanged(WrappedImagePtr, const IntRect* = 0);

trunk/Source/WebCore/rendering/RenderLineBoxList.cpp

@@ -301 +301 @@
             bool inside = curr->nodeAtPoint(request, result, pointInContainer, accumulatedOffset, root->lineTop(), root->lineBottom());
             if (inside) {
-                renderer->updateHitTestResult(result, toPoint(pointInContainer - accumulatedOffset));
+                renderer->updateHitTestResult(result, pointInContainer - toLayoutSize(accumulatedOffset));
                 return true;
             }

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -2170 +2170 @@
 }
 
-void RenderObject::updateHitTestResult(HitTestResult& result, const IntPoint& point)
+void RenderObject::updateHitTestResult(HitTestResult& result, const LayoutPoint& point)
 {
     if (result.innerNode())

trunk/Source/WebCore/rendering/RenderObject.h

@@ -551 +551 @@
     bool hitTest(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestFilter = HitTestAll);
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
-    virtual void updateHitTestResult(HitTestResult&, const IntPoint&);
+    virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&);
 
     virtual VisiblePosition positionForPoint(const IntPoint&);

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -709 +709 @@
 }
 
-void RenderView::updateHitTestResult(HitTestResult& result, const IntPoint& point)
+void RenderView::updateHitTestResult(HitTestResult& result, const LayoutPoint& point)
 {
     if (result.innerNode())

trunk/Source/WebCore/rendering/RenderView.h

@@ -126 +126 @@
     LayoutState* layoutState() const { return m_layoutState; }
 
-    virtual void updateHitTestResult(HitTestResult&, const IntPoint&);
+    virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&);
 
     unsigned pageLogicalHeight() const { return m_pageLogicalHeight; }

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

@@ -170 +170 @@
     for (RenderObject* child = lastChild(); child; child = child->previousSibling()) {
         if (child->nodeAtFloatPoint(request, result, localPoint, hitTestAction)) {
-            updateHitTestResult(result, roundedIntPoint(localPoint));
+            updateHitTestResult(result, roundedLayoutPoint(localPoint));
             return true;
         }

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

@@ -158 +158 @@
         if (hitRules.canHitFill) {
             if (m_objectBoundingBox.contains(localPoint)) {
-                updateHitTestResult(result, roundedIntPoint(localPoint));
+                updateHitTestResult(result, roundedLayoutPoint(localPoint));
                 return true;
             }

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

@@ -264 +264 @@
         if ((hitRules.canHitStroke && (svgStyle->hasStroke() || !hitRules.requireStroke) && strokeContains(localPoint, hitRules.requireStroke))
             || (hitRules.canHitFill && (svgStyle->hasFill() || !hitRules.requireFill) && fillContains(localPoint, hitRules.requireFill, fillRule))) {
-            updateHitTestResult(result, roundedIntPoint(localPoint));
+            updateHitTestResult(result, roundedLayoutPoint(localPoint));
             return true;
         }

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

@@ -465 +465 @@
         // to be able to detect hits on the background of a <div> element. If we'd return true here in the 'Foreground' phase, we are not able 
         // to detect these hits anymore.
-        updateHitTestResult(result, roundedIntPoint(localPoint));
+        updateHitTestResult(result, roundedLayoutPoint(localPoint));
         return true;
     }