Changeset 69192 in webkit

Timestamp:

Oct 6, 2010 7:53:54 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

Rename HitTestResult::rectFromPoint to rectForPoint
​https://bugs.webkit.org/show_bug.cgi?id=47261

Patch by Antonio Gomes <​agomes@rim.org> on 2010-10-06
Reviewed by Kenneth Rohde Christiansen.

As per Kenneth Christiansen request inhttps://bugs.webkit.org/show_bug.cgi?id=46336#c20.

• WebCore.exp.in:
• dom/Document.cpp:

(WebCore::Document::nodesFromRect):

• rendering/EllipsisBox.cpp:

(WebCore::EllipsisBox::nodeAtPoint):

• rendering/HitTestResult.cpp:

(WebCore::HitTestResult::addNodeToRectBasedTestResult):
(WebCore::HitTestResult::rectForPoint):

• rendering/HitTestResult.h:

(WebCore::HitTestResult::rectForPoint):

• 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/RenderLayer.cpp:

(WebCore::RenderLayer::hitTestLayer):
(WebCore::RenderLayer::hitTestChildLayerColumns):

• rendering/RenderTable.cpp:

(WebCore::RenderTable::nodeAtPoint):

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::nodeAtPoint):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• rendering/EllipsisBox.cpp (modified) (1 diff)
• rendering/HitTestResult.cpp (modified) (2 diffs)
• rendering/HitTestResult.h (modified) (3 diffs)
• rendering/InlineFlowBox.cpp (modified) (2 diffs)
• rendering/InlineTextBox.cpp (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (5 diffs)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (2 diffs)
• rendering/RenderTable.cpp (modified) (2 diffs)
• rendering/RenderTableSection.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-06  Antonio Gomes  <agomes@rim.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Rename HitTestResult::rectFromPoint to rectForPoint
+        https://bugs.webkit.org/show_bug.cgi?id=47261
+
+        As per Kenneth Christiansen request inhttps://bugs.webkit.org/show_bug.cgi?id=46336#c20.
+
+        * WebCore.exp.in:
+        * dom/Document.cpp:
+        (WebCore::Document::nodesFromRect):
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::nodeAtPoint):
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::addNodeToRectBasedTestResult):
+        (WebCore::HitTestResult::rectForPoint):
+        * rendering/HitTestResult.h:
+        (WebCore::HitTestResult::rectForPoint):
+        * 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/RenderLayer.cpp:
+        (WebCore::RenderLayer::hitTestLayer):
+        (WebCore::RenderLayer::hitTestChildLayerColumns):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::nodeAtPoint):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::nodeAtPoint):
+
 2010-10-06  Dirk Schulze  <krit@webkit.org>
 

trunk/WebCore/WebCore.exp.in

@@ -282 +282 @@
 __ZN7WebCore13AXObjectCache21gAccessibilityEnabledE
 __ZN7WebCore13AXObjectCache42gAccessibilityEnhancedUserInterfaceEnabledE
-__ZN7WebCore13HitTestResult13rectFromPointERKNS_8IntPointEjjjj
 __ZN7WebCore13HitTestResultC1ERKS0_
 __ZN7WebCore13HitTestResultD1Ev

trunk/WebCore/dom/Document.cpp

@@ -1070 +1070 @@
     if (ignoreClipping)
         type |= HitTestRequest::IgnoreClipping;
-    else if (!frameView->visibleContentRect().intersects(HitTestResult::rectFromPoint(point, topPadding, rightPadding, bottomPadding, leftPadding)))
+    else if (!frameView->visibleContentRect().intersects(HitTestResult::rectForPoint(point, topPadding, rightPadding, bottomPadding, leftPadding)))
         return 0;
 

trunk/WebCore/rendering/EllipsisBox.cpp

@@ -115 +115 @@
 
     IntRect boundsRect = IntRect(tx, ty, m_logicalWidth, m_height);
-    if (visibleToHitTesting() && boundsRect.intersects(result.rectFromPoint(x, y))) {
+    if (visibleToHitTesting() && boundsRect.intersects(result.rectForPoint(x, y))) {
         renderer()->updateHitTestResult(result, IntPoint(x - tx, y - ty));
         if (!result.addNodeToRectBasedTestResult(renderer()->node(), x, y, boundsRect))

trunk/WebCore/rendering/HitTestResult.cpp

@@ -532 +532 @@
     m_rectBasedTestResult.add(node);
 
-    return !rect.contains(rectFromPoint(x, y));
+    return !rect.contains(rectForPoint(x, y));
 }
 
@@ -554 +554 @@
 }
 
-IntRect HitTestResult::rectFromPoint(const IntPoint& point, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding)
+IntRect HitTestResult::rectForPoint(const IntPoint& point, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding)
 {
     IntPoint actualPoint(point);

trunk/WebCore/rendering/HitTestResult.h

@@ -99 +99 @@
     // Rect-based hit test related methods.
     bool isRectBasedTest() const { return m_isRectBased; }
-    IntRect rectFromPoint(int x, int y) const;
-    IntRect rectFromPoint(const IntPoint&) const;
-    static IntRect rectFromPoint(const IntPoint&, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding);
+    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);
     int topPadding() const { return m_topPadding; }
     int rightPadding() const { return m_rightPadding; }
@@ -135 +135 @@
 };
 
-inline IntRect HitTestResult::rectFromPoint(int x, int y) const
+inline IntRect HitTestResult::rectForPoint(int x, int y) const
 {
-    return rectFromPoint(IntPoint(x, y), m_topPadding, m_rightPadding, m_bottomPadding, m_leftPadding);
+    return rectForPoint(IntPoint(x, y), m_topPadding, m_rightPadding, m_bottomPadding, m_leftPadding);
 }
 
@@ -145 +145 @@
 // width = leftPadding + rightPadding + 1
 // height = topPadding + bottomPadding + 1
-inline IntRect HitTestResult::rectFromPoint(const IntPoint& point) const
+inline IntRect HitTestResult::rectForPoint(const IntPoint& point) const
 {
-    return rectFromPoint(point, m_topPadding, m_rightPadding, m_bottomPadding, m_leftPadding);
+    return rectForPoint(point, m_topPadding, m_rightPadding, m_bottomPadding, m_leftPadding);
 }
 

trunk/WebCore/rendering/InlineFlowBox.cpp

@@ -613 +613 @@
     IntRect overflowRect(visibleOverflowRect());
     overflowRect.move(tx, ty);
-    if (!overflowRect.intersects(result.rectFromPoint(x, y)))
+    if (!overflowRect.intersects(result.rectForPoint(x, y)))
         return false;
 
@@ -626 +626 @@
     // Now check ourselves.
     IntRect rect(tx + m_x, ty + m_y, m_logicalWidth, logicalHeight());
-    if (visibleToHitTesting() && rect.intersects(result.rectFromPoint(x, y))) {
+    if (visibleToHitTesting() && rect.intersects(result.rectForPoint(x, y))) {
         renderer()->updateHitTestResult(result, IntPoint(x - tx, y - 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(), x, y, rect))

trunk/WebCore/rendering/InlineTextBox.cpp

@@ -288 +288 @@
 
     IntRect rect(tx + m_x, ty + m_y, m_logicalWidth, logicalHeight());
-    if (m_truncation != cFullTruncation && visibleToHitTesting() && rect.intersects(result.rectFromPoint(x, y))) {
+    if (m_truncation != cFullTruncation && visibleToHitTesting() && rect.intersects(result.rectForPoint(x, y))) {
         renderer()->updateHitTestResult(result, IntPoint(x - tx, y - ty));
         if (!result.addNodeToRectBasedTestResult(renderer()->node(), x, y, rect))

trunk/WebCore/rendering/RenderBlock.cpp

@@ -3972 +3972 @@
         IntRect overflowBox = visibleOverflowRect();
         overflowBox.move(tx, ty);
-        if (!overflowBox.intersects(result.rectFromPoint(_x, _y)))
+        if (!overflowBox.intersects(result.rectForPoint(_x, _y)))
             return false;
     }
@@ -3986 +3986 @@
     bool useOverflowClip = hasOverflowClip() && !hasSelfPaintingLayer();
     bool useClip = (hasControlClip() || useOverflowClip);
-    IntRect hitTestArea(result.rectFromPoint(_x, _y));
+    IntRect hitTestArea(result.rectForPoint(_x, _y));
     bool checkChildren = !useClip || (hasControlClip() ? controlClipRect(tx, ty).intersects(hitTestArea) : overflowClipRect(tx, ty).intersects(hitTestArea));
     if (checkChildren) {
@@ -4015 +4015 @@
     if (hitTestAction == HitTestBlockBackground || hitTestAction == HitTestChildBlockBackground) {
         IntRect boundsRect(tx, ty, width(), height());
-        if (visibleToHitTesting() && boundsRect.intersects(result.rectFromPoint(_x, _y))) {
+        if (visibleToHitTesting() && boundsRect.intersects(result.rectForPoint(_x, _y))) {
             updateHitTestResult(result, IntPoint(_x - tx, _y - ty));
             if (!result.addNodeToRectBasedTestResult(node(), _x, _y, boundsRect))
@@ -4069 +4069 @@
         colRect.move(tx, ty);
         
-        if (colRect.intersects(result.rectFromPoint(x, y))) {
+        if (colRect.intersects(result.rectForPoint(x, y))) {
             // The point is inside this column.
             // Adjust tx and ty to change where we hit test.
@@ -4075 +4075 @@
             int finalX = tx + currXOffset;
             int finalY = ty + currYOffset;
-            if (result.isRectBasedTest() && !colRect.contains(result.rectFromPoint(x, y)))
+            if (result.isRectBasedTest() && !colRect.contains(result.rectForPoint(x, y)))
                 hitTestContents(request, result, x, y, finalX, finalY, hitTestAction);
             else

trunk/WebCore/rendering/RenderBox.cpp

@@ -680 +680 @@
     // foreground phase (which is true for replaced elements like images).
     IntRect boundsRect = IntRect(tx, ty, width(), height());
-    if (visibleToHitTesting() && action == HitTestForeground && boundsRect.intersects(result.rectFromPoint(xPos, yPos))) {
+    if (visibleToHitTesting() && action == HitTestForeground && boundsRect.intersects(result.rectForPoint(xPos, yPos))) {
         updateHitTestResult(result, IntPoint(xPos - tx, yPos - ty));
         if (!result.addNodeToRectBasedTestResult(node(), xPos, yPos, boundsRect))

trunk/WebCore/rendering/RenderLayer.cpp

@@ -2779 +2779 @@
 #endif
 
-    IntRect hitTestArea = result.rectFromPoint(hitTestPoint);
+    IntRect hitTestArea = result.rectForPoint(hitTestPoint);
 
     // Apply a transform if we have one.
@@ -3062 +3062 @@
         localClipRect.intersect(colRect);
         
-        if (!localClipRect.isEmpty() && localClipRect.intersects(result.rectFromPoint(hitTestPoint))) {
+        if (!localClipRect.isEmpty() && localClipRect.intersects(result.rectForPoint(hitTestPoint))) {
             RenderLayer* hitLayer = 0;
             if (!columnIndex) {

trunk/WebCore/rendering/RenderTable.cpp

@@ -1128 +1128 @@
 
     // Check kids first.
-    if (!hasOverflowClip() || overflowClipRect(tx, ty).intersects(result.rectFromPoint(xPos, yPos))) {
+    if (!hasOverflowClip() || overflowClipRect(tx, ty).intersects(result.rectForPoint(xPos, yPos))) {
         for (RenderObject* child = lastChild(); child; child = child->previousSibling()) {
             if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (child->isTableSection() || child == m_caption) &&
@@ -1140 +1140 @@
     // Check our bounds next.
     IntRect boundsRect = IntRect(tx, ty, width(), height());
-    if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectFromPoint(xPos, yPos))) {
+    if (visibleToHitTesting() && (action == HitTestBlockBackground || action == HitTestChildBlockBackground) && boundsRect.intersects(result.rectForPoint(xPos, yPos))) {
         updateHitTestResult(result, IntPoint(xPos - tx, yPos - ty));
         if (!result.addNodeToRectBasedTestResult(node(), xPos, yPos, boundsRect))

trunk/WebCore/rendering/RenderTableSection.cpp

@@ -1197 +1197 @@
     ty += y();
 
-    if (hasOverflowClip() && !overflowClipRect(tx, ty).intersects(result.rectFromPoint(xPos, yPos)))
+    if (hasOverflowClip() && !overflowClipRect(tx, ty).intersects(result.rectForPoint(xPos, yPos)))
         return false;