Changeset 18758 in webkit

Timestamp:

Jan 10, 2007 11:26:44 PM (17 years ago)

Author:

hyatt

Message:

Rework positionForCoordinates to be more efficient and to handle multi-column content. This entailed
adding a new field to HitTestResult called localPoint that cached the mouse coordinate in the coordinate
space of the renderer.

positionForCoordinates now takes local coordinates and so no longer needs to waste time recomputing
absolute positions over and over again.

Reviewed by darin

• bridge/mac/WebCoreAXObject.mm: (-[WebCoreAXObject value]): (-[WebCoreAXObject doAXTextMarkerRangeForLine:]): (-[WebCoreAXObject doAXTextMarkerForPosition:]):
• dom/Document.cpp: (WebCore::Document::prepareMouseEvent):
• editing/SelectionController.cpp: (WebCore::SelectionController::contains):
• editing/visible_units.cpp: (WebCore::previousLinePosition): (WebCore::nextLinePosition):
• page/EventHandler.cpp: (WebCore::EventHandler::selectClosestWordFromMouseEvent): (WebCore::EventHandler::handleMousePressEventDoubleClick): (WebCore::EventHandler::handleMousePressEventTripleClick): (WebCore::EventHandler::handleMousePressEventSingleClick): (WebCore::EventHandler::handleMouseMoveEvent): (WebCore::EventHandler::handleMouseReleaseEvent): (WebCore::EventHandler::sendContextMenuEvent):
• page/EventHandler.h:
• page/MouseEventWithHitTestResults.cpp: (WebCore::MouseEventWithHitTestResults::MouseEventWithHitTestResults):
• page/MouseEventWithHitTestResults.h: (WebCore::MouseEventWithHitTestResults::localPoint):
• page/mac/WebCoreFrameBridge.mm: (-[WebCoreFrameBridge _visiblePositionForPoint:]):
• rendering/EllipsisBox.cpp: (WebCore::EllipsisBox::nodeAtPoint):
• rendering/HitTestResult.h: (WebCore::HitTestResult::localPoint): (WebCore::HitTestResult::setLocalPoint):
• rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::nodeAtPoint):
• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::nodeAtPoint):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::nodeAtPoint): (WebCore::RenderBlock::hitTestContents): (WebCore::RenderBlock::positionForCoordinates):
• rendering/RenderBox.cpp: (WebCore::RenderBox::nodeAtPoint):
• rendering/RenderContainer.cpp: (WebCore::RenderContainer::positionForCoordinates):
• rendering/RenderFlow.cpp: (WebCore::RenderFlow::hitTestLines):
• rendering/RenderInline.cpp: (WebCore::RenderInline::positionForCoordinates):
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::autoscroll): (WebCore::RenderLayer::hitTestLayer):
• rendering/RenderObject.cpp: (WebCore::RenderObject::updateHitTestResult):
• rendering/RenderObject.h:
• rendering/RenderPath.cpp: (WebCore::RenderPath::nodeAtPoint):
• rendering/RenderReplaced.cpp: (WebCore::RenderReplaced::positionForCoordinates):
• rendering/RenderTableRow.cpp: (WebCore::RenderTableRow::nodeAtPoint):
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::nodeAtPoint):
• rendering/RenderText.cpp: (WebCore::RenderText::positionForCoordinates):
• rendering/RootInlineBox.cpp: (WebCore::RootInlineBox::nodeAtPoint): (WebCore::RootInlineBox::closestLeafChildForXPos):
• rendering/RootInlineBox.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/mac/WebCoreAXObject.mm (modified) (4 diffs)
• dom/Document.cpp (modified) (2 diffs)
• editing/SelectionController.cpp (modified) (1 diff)
• editing/visible_units.cpp (modified) (2 diffs)
• page/EventHandler.cpp (modified) (7 diffs)
• page/EventHandler.h (modified) (1 diff)
• page/MouseEventWithHitTestResults.cpp (modified) (1 diff)
• page/MouseEventWithHitTestResults.h (modified) (2 diffs)
• page/mac/WebCoreFrameBridge.mm (modified) (2 diffs)
• rendering/EllipsisBox.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) (12 diffs)
• rendering/RenderBlock.h (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderContainer.cpp (modified) (3 diffs)
• rendering/RenderFlow.cpp (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (2 diffs)
• rendering/RenderObject.cpp (modified) (3 diffs)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderPath.cpp (modified) (1 diff)
• rendering/RenderReplaced.cpp (modified) (1 diff)
• rendering/RenderTableRow.cpp (modified) (1 diff)
• rendering/RenderTableSection.cpp (modified) (1 diff)
• rendering/RenderText.cpp (modified) (2 diffs)
• rendering/RootInlineBox.cpp (modified) (4 diffs)
• rendering/RootInlineBox.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-10  David Hyatt  <hyatt@apple.com>
+
+        Rework positionForCoordinates to be more efficient and to handle multi-column content.  This entailed
+        adding a new field to HitTestResult called localPoint that cached the mouse coordinate in the coordinate
+        space of the renderer.
+
+        positionForCoordinates now takes local coordinates and so no longer needs to waste time recomputing
+        absolute positions over and over again.
+
+        Reviewed by darin
+
+        * bridge/mac/WebCoreAXObject.mm:
+        (-[WebCoreAXObject value]):
+        (-[WebCoreAXObject doAXTextMarkerRangeForLine:]):
+        (-[WebCoreAXObject doAXTextMarkerForPosition:]):
+        * dom/Document.cpp:
+        (WebCore::Document::prepareMouseEvent):
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::contains):
+        * editing/visible_units.cpp:
+        (WebCore::previousLinePosition):
+        (WebCore::nextLinePosition):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::selectClosestWordFromMouseEvent):
+        (WebCore::EventHandler::handleMousePressEventDoubleClick):
+        (WebCore::EventHandler::handleMousePressEventTripleClick):
+        (WebCore::EventHandler::handleMousePressEventSingleClick):
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        (WebCore::EventHandler::handleMouseReleaseEvent):
+        (WebCore::EventHandler::sendContextMenuEvent):
+        * page/EventHandler.h:
+        * page/MouseEventWithHitTestResults.cpp:
+        (WebCore::MouseEventWithHitTestResults::MouseEventWithHitTestResults):
+        * page/MouseEventWithHitTestResults.h:
+        (WebCore::MouseEventWithHitTestResults::localPoint):
+        * page/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge _visiblePositionForPoint:]):
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::nodeAtPoint):
+        * rendering/HitTestResult.h:
+        (WebCore::HitTestResult::localPoint):
+        (WebCore::HitTestResult::setLocalPoint):
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::nodeAtPoint):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::nodeAtPoint):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::nodeAtPoint):
+        (WebCore::RenderBlock::hitTestContents):
+        (WebCore::RenderBlock::positionForCoordinates):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::nodeAtPoint):
+        * rendering/RenderContainer.cpp:
+        (WebCore::RenderContainer::positionForCoordinates):
+        * rendering/RenderFlow.cpp:
+        (WebCore::RenderFlow::hitTestLines):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::positionForCoordinates):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::autoscroll):
+        (WebCore::RenderLayer::hitTestLayer):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::updateHitTestResult):
+        * rendering/RenderObject.h:
+        * rendering/RenderPath.cpp:
+        (WebCore::RenderPath::nodeAtPoint):
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::positionForCoordinates):
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::nodeAtPoint):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::nodeAtPoint):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::positionForCoordinates):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::nodeAtPoint):
+        (WebCore::RootInlineBox::closestLeafChildForXPos):
+        * rendering/RootInlineBox.h:
+
 2007-01-11  George Staikos  <staikos@kde.org>
 

trunk/WebCore/bridge/mac/WebCoreAXObject.mm

@@ -580 +580 @@
         
         // FIXME: should use startOfDocument and endOfDocument (or rangeForDocument?) here
-        VisiblePosition startVisiblePosition = m_renderer->positionForCoordinates (0, 0);
-        VisiblePosition endVisiblePosition   = m_renderer->positionForCoordinates (LONG_MAX, LONG_MAX);
+        VisiblePosition startVisiblePosition = m_renderer->positionForCoordinates(0, 0);
+        VisiblePosition endVisiblePosition   = m_renderer->positionForCoordinates(LONG_MAX, LONG_MAX);
         if (startVisiblePosition.isNull() || endVisiblePosition.isNull())
             return nil;
@@ -1222 +1222 @@
     // NOTE: BUG this is wrong when lineNumber is lineCount+1,  because nextLinePosition takes you to the
     // last offset of the last line
-    VisiblePosition visiblePos = [self topRenderer]->positionForCoordinates (0, 0);
+    VisiblePosition visiblePos = [self topRenderer]->positionForCoordinates(0, 0);
     VisiblePosition savedVisiblePos;
     while (--lineCount != 0) {
@@ -1267 +1267 @@
     RenderObject* renderer = [self topRenderer];
     Node* innerNode = NULL;
-    NSPoint ourpoint;
     
     // locate the node containing the point
+    IntPoint pointResult;
     while (1) {
         // ask the document layer to hitTest
         NSPoint windowCoord = [[view window] convertScreenToBase: point];
-        ourpoint = [view convertPoint:windowCoord fromView:nil];
-        
+        IntPoint ourpoint([view convertPoint:windowCoord fromView:nil]);
+
         HitTestRequest request(true, true);
-        HitTestResult result = HitTestResult(IntPoint(ourpoint));
+        HitTestResult result(ourpoint);
         renderer->layer()->hitTest(request, result);
         innerNode = result.innerNode();
         if (!innerNode || !innerNode->renderer())
             return nil;
+
+        pointResult = result.localPoint();
 
         // done if hit something other than a widget
@@ -1303 +1305 @@
     
     // get position within the node
-    VisiblePosition pos = innerNode->renderer()->positionForCoordinates ((int)ourpoint.x, (int)ourpoint.y);
+    VisiblePosition pos = innerNode->renderer()->positionForPoint(pointResult);
     return (id) [self textMarkerForVisiblePosition:pos];
 }

trunk/WebCore/dom/Document.cpp

@@ -1664 +1664 @@
 
     if (!renderer())
-        return MouseEventWithHitTestResults(event, 0, 0, false);
+        return MouseEventWithHitTestResults(event, 0, IntPoint(), 0, false);
 
     HitTestResult result(documentPoint);
@@ -1673 +1673 @@
 
     bool isOverLink = result.URLElement() && !result.URLElement()->getAttribute(hrefAttr).isNull();
-    return MouseEventWithHitTestResults(event, result.innerNode(), result.scrollbar(), isOverLink);
+    return MouseEventWithHitTestResults(event, result.innerNode(), result.localPoint(), result.scrollbar(), isOverLink);
 }
 

trunk/WebCore/editing/SelectionController.cpp

@@ -1008 +1008 @@
         return false;
     
-    Position pos(innerNode->renderer()->positionForPoint(point).deepEquivalent());
+    Position pos(innerNode->renderer()->positionForPoint(result.localPoint()).deepEquivalent());
     if (pos.isNull())
         return false;

trunk/WebCore/editing/visible_units.cpp

@@ -444 +444 @@
     
     if (root) {
+        // FIXME: Can be wrong for multi-column layout.
         int absx, absy;
         containingBlock->absolutePositionForContent(absx, absy);
         if (containingBlock->hasOverflowClip())
             containingBlock->layer()->subtractScrollOffset(absx, absy);
-        RenderObject *renderer = root->closestLeafChildForXPos(x, absx)->object();
+        RenderObject *renderer = root->closestLeafChildForXPos(x - absx)->object();
         Node* node = renderer->element();
         if (editingIgnoresContent(node))
             return Position(node->parent(), node->nodeIndex());
-        return renderer->positionForCoordinates(x, absy + root->topOverflow());
+        return renderer->positionForCoordinates(x - absx, root->topOverflow());
     }
     
@@ -513 +514 @@
     
     if (root) {
+        // FIXME: Can be wrong for multi-column layout.
         int absx, absy;
         containingBlock->absolutePositionForContent(absx, absy);
         if (containingBlock->hasOverflowClip())
             containingBlock->layer()->subtractScrollOffset(absx, absy);
-        RenderObject *renderer = root->closestLeafChildForXPos(x, absx)->object();
+        RenderObject *renderer = root->closestLeafChildForXPos(x - absx)->object();
         Node* node = renderer->element();
         if (editingIgnoresContent(node))
             return Position(node->parent(), node->nodeIndex());
-        return renderer->positionForCoordinates(x, absy + root->topOverflow());
+        return renderer->positionForCoordinates(x - absx, root->topOverflow());
     }    
 

trunk/WebCore/page/EventHandler.cpp

@@ -126 +126 @@
 }
 
-void EventHandler::selectClosestWordFromMouseEvent(const PlatformMouseEvent& mouse, Node *innerNode)
-{
+void EventHandler::selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults& result)
+{
+    Node* innerNode = result.targetNode();
     Selection newSelection;
 
     if (innerNode && innerNode->renderer() && m_mouseDownMayStartSelect && innerNode->renderer()->shouldSelect()) {
-        IntPoint vPoint = m_frame->view()->windowToContents(mouse.pos());
-        VisiblePosition pos(innerNode->renderer()->positionForPoint(vPoint));
+        VisiblePosition pos(innerNode->renderer()->positionForPoint(result.localPoint()));
         if (pos.isNotNull()) {
             newSelection = Selection(pos);
@@ -161 +161 @@
         m_beganSelectingText = true;
     else
-        selectClosestWordFromMouseEvent(event.event(), event.targetNode());
+        selectClosestWordFromMouseEvent(event);
 
     return true;
@@ -177 +177 @@
 
     Selection newSelection;
-    IntPoint vPoint = m_frame->view()->windowToContents(event.event().pos());
-    VisiblePosition pos(innerNode->renderer()->positionForPoint(vPoint));
+    VisiblePosition pos(innerNode->renderer()->positionForPoint(event.localPoint()));
     if (pos.isNotNull()) {
         newSelection = Selection(pos);
@@ -213 +212 @@
         return false;
 
-    VisiblePosition visiblePos(innerNode->renderer()->positionForPoint(vPoint));
+    VisiblePosition visiblePos(innerNode->renderer()->positionForPoint(event.localPoint()));
     if (visiblePos.isNull())
         visiblePos = VisiblePosition(innerNode, innerNode->caretMinOffset(), DOWNSTREAM);
@@ -324 +323 @@
 
     // handle making selection
-    IntPoint vPoint = m_frame->view()->windowToContents(event.event().pos());        
-    VisiblePosition pos(innerNode->renderer()->positionForPoint(vPoint));
+    VisiblePosition pos(innerNode->renderer()->positionForPoint(event.localPoint()));
 
     updateSelectionForMouseDragOverPosition(pos);
@@ -379 +377 @@
         Node *node = event.targetNode();
         if (node && node->isContentEditable() && node->renderer()) {
-            IntPoint vPoint = m_frame->view()->windowToContents(event.event().pos());
-            VisiblePosition pos = node->renderer()->positionForPoint(vPoint);
+            VisiblePosition pos = node->renderer()->positionForPoint(event.localPoint());
             newSelection = Selection(pos);
         }
@@ -1129 +1126 @@
             || (mev.targetNode() && mev.targetNode()->isContentEditable()))) {
         m_mouseDownMayStartSelect = true; // context menu events are always allowed to perform a selection
-        selectClosestWordFromMouseEvent(event, mev.targetNode());
+        selectClosestWordFromMouseEvent(mev);
     }
     

trunk/WebCore/page/EventHandler.h

@@ -148 +148 @@
 
 private:
-    void selectClosestWordFromMouseEvent(const PlatformMouseEvent&, Node* innerNode);
+    void selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults& event);
 
     bool handleMouseDoubleClickEvent(const PlatformMouseEvent&);

trunk/WebCore/page/MouseEventWithHitTestResults.cpp

@@ -36 +36 @@
 
 MouseEventWithHitTestResults::MouseEventWithHitTestResults(const PlatformMouseEvent& event,
-        PassRefPtr<Node> node, PlatformScrollbar* scrollbar, bool isOverLink)
+        PassRefPtr<Node> node, const IntPoint& localPoint, PlatformScrollbar* scrollbar, bool isOverLink)
     : m_event(event)
     , m_targetNode(node)
     , m_targetElement(targetElement(m_targetNode.get()))
+    , m_localPoint(localPoint)
     , m_scrollbar(scrollbar)
     , m_isOverLink(isOverLink)

trunk/WebCore/page/MouseEventWithHitTestResults.h

@@ -29 +29 @@
 class PlatformScrollbar;
 
+// FIXME: Why doesn't this class just cache a HitTestResult instead of copying all of HitTestResult's fields over?
 class MouseEventWithHitTestResults {
 public:
-    MouseEventWithHitTestResults(const PlatformMouseEvent&, PassRefPtr<Node>, PlatformScrollbar*, bool isOverLink);
+    MouseEventWithHitTestResults(const PlatformMouseEvent&, PassRefPtr<Node>, const IntPoint& localPoint, PlatformScrollbar*, bool isOverLink);
 
     const PlatformMouseEvent& event() const { return m_event; }
     Node* targetNode() const;
+    const IntPoint& localPoint() const { return m_localPoint; }
     PlatformScrollbar* scrollbar() const { return m_scrollbar; }
     bool isOverLink() const { return m_isOverLink; }
@@ -42 +44 @@
     RefPtr<Node> m_targetNode;
     RefPtr<Element> m_targetElement;
+    IntPoint m_localPoint;
     PlatformScrollbar* m_scrollbar;
     bool m_isOverLink;

trunk/WebCore/page/mac/WebCoreFrameBridge.mm

@@ -1206 +1206 @@
 {
     IntPoint outerPoint(point);
-    Node* node = m_frame->eventHandler()->hitTestResultAtPoint(outerPoint, true).innerNode();
+    HitTestResult result = m_frame->eventHandler()->hitTestResultAtPoint(outerPoint, true);
+    Node* node = result.innerNode();
     if (!node)
         return VisiblePosition();
@@ -1212 +1213 @@
     if (!renderer)
         return VisiblePosition();
-    FrameView* outerView = m_frame->view();
-    FrameView* innerView = node->document()->view();
-    IntPoint innerPoint = innerView->windowToContents(outerView->contentsToWindow(outerPoint));
-    VisiblePosition visiblePos = renderer->positionForCoordinates(innerPoint.x(), innerPoint.y());
+    VisiblePosition visiblePos = renderer->positionForCoordinates(result.localPoint().x(), result.localPoint().y());
     if (visiblePos.isNull())
         visiblePos = VisiblePosition(Position(node, 0));

trunk/WebCore/rendering/EllipsisBox.cpp

@@ -72 +72 @@
         int mty = ty + m_baseline - (m_markupBox->yPos() + m_markupBox->baseline());
         if (m_markupBox->nodeAtPoint(request, result, x, y, mtx, mty)) {
-            object()->setInnerNode(result);
+            object()->updateHitTestResult(result, IntPoint(x - mtx, y - mty));
             return true;
         }
@@ -78 +78 @@
 
     if (object()->style()->visibility() == VISIBLE && IntRect(tx, ty, m_width, m_height).contains(x, y)) {
-        object()->setInnerNode(result);
+        object()->updateHitTestResult(result, IntPoint(x - tx, y - ty));
         return true;
     }

trunk/WebCore/rendering/HitTestResult.h

@@ -47 +47 @@
     Node* innerNonSharedNode() const { return m_innerNonSharedNode.get(); }
     IntPoint point() const { return m_point; }
+    IntPoint localPoint() const { return m_localPoint; }
     Element* URLElement() const { return m_innerURLElement.get(); }
     PlatformScrollbar* scrollbar() const { return m_scrollbar.get(); }
@@ -53 +54 @@
     void setInnerNonSharedNode(Node*);
     void setPoint(const IntPoint& p) { m_point = p; }
+    void setLocalPoint(const IntPoint& p) { m_localPoint = p; }
     void setURLElement(Element*);
     void setScrollbar(PlatformScrollbar*);
@@ -74 +76 @@
     RefPtr<Node> m_innerNonSharedNode;
     IntPoint m_point;
+    IntPoint m_localPoint; // A point in the local coordinate space of m_innerNonSharedNode's renderer.  Allows us to efficiently
+                           // determine where inside the renderer we hit on subsequent operations.
     RefPtr<Element> m_innerURLElement;
     RefPtr<PlatformScrollbar> m_scrollbar;

trunk/WebCore/rendering/InlineFlowBox.cpp

@@ -535 +535 @@
     for (InlineBox* curr = lastChild(); curr; curr = curr->prevOnLine()) {
         if (!curr->object()->layer() && curr->nodeAtPoint(request, result, x, y, tx, ty)) {
-            object()->setInnerNode(result);
+            object()->updateHitTestResult(result, IntPoint(x - tx, y - ty));
             return true;
         }
@@ -543 +543 @@
     IntRect rect(tx + m_x, ty + m_y, m_width, m_height);
     if (object()->style()->visibility() == VISIBLE && rect.contains(x, y)) {
-        object()->setInnerNode(result);
+        object()->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.
         return true;
     }

trunk/WebCore/rendering/InlineTextBox.cpp

@@ -249 +249 @@
     IntRect rect(tx + m_x, ty + m_y, m_width, m_height);
     if (m_truncation != cFullTruncation && object()->style()->visibility() == VISIBLE && rect.contains(x, y)) {
-        object()->setInnerNode(result);
+        object()->updateHitTestResult(result, IntPoint(x - tx, y - ty));
         return true;
     }

trunk/WebCore/rendering/RenderBlock.cpp

@@ -2628 +2628 @@
     if (isPointInScrollbar(result, _x, _y, tx, ty)) {
         if (hitTestAction == HitTestBlockBackground) {
-            setInnerNode(result);
+            updateHitTestResult(result, IntPoint(_x - tx, _y - ty));
             return true;
         }
@@ -2657 +2657 @@
         FloatingObject* o;
         DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
-        for (it.toLast(); (o = it.current()); --it)
-            if (!o->noPaint && !o->node->layer() && o->node->hitTest(request, result, _x, _y,
-                                     scrolledX + o->left + o->node->marginLeft() - o->node->xPos(),
-                                     scrolledY + o->startY + o->node->marginTop() - o->node->yPos())) {
-                setInnerNode(result);
-                return true;
-            }
+        for (it.toLast(); (o = it.current()); --it) {
+            if (!o->noPaint && !o->node->layer()) {
+                int xoffset = scrolledX + o->left + o->node->marginLeft() - o->node->xPos();
+                int yoffset =  scrolledY + o->startY + o->node->marginTop() - o->node->yPos();
+                if (o->node->hitTest(request, result, _x, _y, xoffset, yoffset)) {
+                    updateHitTestResult(result, IntPoint(_x - xoffset, _y - yoffset));
+                    return true;
+                }
+            }
+        }
     }
 
@@ -2671 +2674 @@
         IntRect boundsRect(tx, ty - topExtra, m_width, m_height + topExtra + borderBottomExtra());
         if (style()->visibility() == VISIBLE && boundsRect.contains(_x, _y)) {
-            setInnerNode(result);
+            updateHitTestResult(result, IntPoint(_x - tx, _y - ty + topExtra));
             return true;
         }
@@ -2717 +2720 @@
         // We have to hit-test our line boxes.
         if (hitTestLines(request, result, x, y, tx, ty, hitTestAction)) {
-            setInnerNode(result);
+            updateHitTestResult(result, IntPoint(x - tx, y - ty));
             return true;
         }
@@ -2729 +2732 @@
             // table-specific hit-test method (which we should do for performance reasons anyway), then we can remove this check.
             if (!child->layer() && !child->isFloating() && !child->isInlineFlow() && child->nodeAtPoint(request, result, x, y, tx, ty, childHitTest)) {
-                setInnerNode(result);
+                updateHitTestResult(result, IntPoint(x - tx, y - ty));
                 return true;
             }
@@ -2771 +2774 @@
         return RenderFlow::positionForCoordinates(x, y); 
 
-    int absx, absy;
-    absolutePositionForContent(absx, absy);
-
-    int top = absy + borderTop() + paddingTop();
-    int bottom = top + contentHeight();
-
-    int left = absx + borderLeft() + paddingLeft();
+    int top = borderTop() + paddingTop();
+    int bottom = top + contentHeight() + borderTopExtra() + borderBottomExtra();
+
+    int left = borderLeft() + paddingLeft();
     int right = left + contentWidth();
 
     Node* n = element();
     
+    int contentsX = x;
+    int contentsY = y - borderTopExtra();
+    if (hasOverflowClip())
+        m_layer->scrollOffset(contentsX, contentsY);
+    if (hasColumns()) {
+        IntPoint contentsPoint(contentsX, contentsY);
+        adjustPointToColumnContents(contentsPoint);
+        contentsX = contentsPoint.x();
+        contentsY = contentsPoint.y();
+    }
+
     if (isReplaced()) {
-        if (y < absy || y < absy + height() && x < absx)
+        if (y < 0 || y < height() && x < 0)
             return VisiblePosition(n, caretMinOffset(), DOWNSTREAM);
-        if (y >= absy + height() || y >= absy && x >= absx + width())
+        if (y >= height() || y >= 0 && x >= width())
             return VisiblePosition(n, caretMaxOffset(), DOWNSTREAM);
     } 
@@ -2797 +2808 @@
         if (y < top || (isEditableRoot && (y < bottom && x < left))) {
             if (!isEditableRoot)
-                if (RenderObject* c = firstChild()) {
-                    VisiblePosition p = c->positionForCoordinates(x, y);
+                if (RenderObject* c = firstChild()) { // FIXME: This code doesn't make any sense.  This child could be an inline or a positioned element or a float or a compact, etc.
+                    VisiblePosition p = c->positionForCoordinates(contentsX - c->xPos(), contentsY - c->yPos());
                     if (p.isNotNull())
                         return p;
@@ -2813 +2824 @@
         if (y >= bottom || (isEditableRoot && (y >= top && x >= right))) {
             if (!isEditableRoot)
-                if (RenderObject* c = lastChild()) {
-                    VisiblePosition p = c->positionForCoordinates(x, y);
+                if (RenderObject* c = lastChild()) { // FIXME: This code doesn't make any sense.  This child could be an inline or a positioned element or a float or a compact, ect.
+                    VisiblePosition p = c->positionForCoordinates(contentsX - c->xPos(), contentsY - c->yPos());
                     if (p.isNotNull())
                         return p;
@@ -2831 +2842 @@
         if (!firstRootBox())
             return VisiblePosition(n, 0, DOWNSTREAM);
-            
-        int contentsX = absx;
-        int contentsY = absy;
-        if (hasOverflowClip())
-            layer()->subtractScrollOffset(contentsX, contentsY); 
-
-        if (y < contentsY + firstRootBox()->topOverflow() - verticalLineClickFudgeFactor)
+
+        if (contentsY < firstRootBox()->topOverflow() - verticalLineClickFudgeFactor)
             // y coordinate is above first root line box
             return VisiblePosition(positionForBox(firstRootBox()->firstLeafChild(), true), DOWNSTREAM);
@@ -2846 +2852 @@
             if (root->nextRootBox())
                 // FIXME: make the break point halfway between the bottom of the previous root box and the top of the next root box
-                bottom = contentsY + root->nextRootBox()->topOverflow();
+                bottom = root->nextRootBox()->topOverflow();
             else
-                bottom = contentsY + root->bottomOverflow() + verticalLineClickFudgeFactor;
+                bottom = root->bottomOverflow() + verticalLineClickFudgeFactor;
             // check if this root line box is located at this y coordinate
-            if (y < bottom && root->firstChild()) {
-                InlineBox* closestBox = root->closestLeafChildForXPos(x, contentsX);
+            if (contentsY < bottom && root->firstChild()) {
+                InlineBox* closestBox = root->closestLeafChildForXPos(x);
                 if (closestBox)
                     // pass the box a y position that is inside it
-                    return closestBox->object()->positionForCoordinates(x, contentsY + closestBox->m_y);
+                    return closestBox->object()->positionForCoordinates(contentsX, closestBox->m_y);
             }
         }
@@ -2869 +2875 @@
         if (renderer->height() == 0 || renderer->style()->visibility() != VISIBLE || renderer->isFloatingOrPositioned())
             continue;
-        renderer->absolutePositionForContent(absx, top);
         RenderObject* next = renderer->nextSibling();
         while (next && next->isFloatingOrPositioned())
             next = next->nextSibling();
         if (next) 
-            next->absolutePositionForContent(absx, bottom);
+            bottom = next->yPos();
         else
-            bottom = top + contentHeight();
-        if (y >= top && y < bottom)
-            return renderer->positionForCoordinates(x, y);
+            bottom = top + scrollHeight();
+        if (contentsY >= renderer->yPos() && contentsY < bottom)
+            return renderer->positionForCoordinates(contentsX - renderer->xPos(), contentsY - renderer->yPos());
     }
     
@@ -3016 +3021 @@
     
     ASSERT(m_columnRects && m_columnCount == m_columnRects->size());
+}
+
+void RenderBlock::adjustPointToColumnContents(IntPoint& point) const
+{
+    // Just bail if we have no columns.
+    if (!hasColumns() || !m_columnRects)
+        return;
+
+    // Begin with a result rect that is empty.
+    IntRect result;
+    
+    // Determine which columns we intersect.
+    int colGap = columnGap();
+    int leftGap = colGap / 2;
+    IntPoint columnPoint(m_columnRects->at(0).location());
+    for (unsigned i = 0; i < m_columnRects->size(); i++) {
+        // Add in half the column gap to the left and right of the rect.
+        IntRect colRect = m_columnRects->at(i);
+        IntRect gapAndColumnRect(colRect.x() - leftGap, colRect.y(), colRect.width() + colGap, colRect.height());
+        
+        if (gapAndColumnRect.contains(point))
+            // We're inside the column.  Translate the x and y into our column coordinate space.
+            point -= columnPoint - colRect.location();
+
+        // Move to the next position.
+        columnPoint.setY(columnPoint.y() + colRect.height());
+    }
 }
 

trunk/WebCore/rendering/RenderBlock.h

@@ -283 +283 @@
     virtual bool hasColumns() const { return m_columnCount > 1; }
     void adjustRectForColumns(IntRect&) const;
+private:
+    void adjustPointToColumnContents(IntPoint&) const;
 
 protected:

trunk/WebCore/rendering/RenderBox.cpp

@@ -273 +273 @@
         // then we can remove this check.
         if (!child->layer() && !child->isInlineFlow() && child->nodeAtPoint(request, result, x, y, tx, ty, action)) {
-            setInnerNode(result);
+            updateHitTestResult(result, IntPoint(x - tx, y - ty));
             return true;
         }
@@ -281 +281 @@
     // foreground phase (which is true for replaced elements like images).
     if (action == HitTestForeground && IntRect(tx, ty, m_width, m_height).contains(x, y)) {
-        setInnerNode(result);
+        updateHitTestResult(result, IntPoint(x - tx, y - ty));
         return true;
     }

trunk/WebCore/rendering/RenderContainer.cpp

@@ -540 +540 @@
         
     if (isTable() && element()) {
-        int absx, absy;
-        absolutePositionForContent(absx, absy);
-        
-        int left = absx;
-        int right = left + contentWidth() + borderRight() + paddingRight() + borderLeft() + paddingLeft();
-        int top = absy;
-        int bottom = top + contentHeight() + borderTop() + paddingTop() + borderBottom() + paddingBottom();
-        
-        if (x < left || x > right || y < top || y > bottom) {
-            if (x <= (left + right) / 2)
+        int right = contentWidth() + borderRight() + paddingRight() + borderLeft() + paddingLeft();
+        int bottom = contentHeight() + borderTop() + paddingTop() + borderBottom() + paddingBottom();
+        
+        if (x < 0 || x > right || y < 0 || y > bottom) {
+            if (x <= right / 2)
                 return VisiblePosition(Position(element(), 0));
             else
@@ -559 +554 @@
     int minDist = INT_MAX;
     RenderObject* closestRenderer = 0;
+    int newX = x;
+    int newY = y;
+    if (isTableRow()) {
+        newX += xPos();
+        newY += yPos();
+    }
     for (RenderObject* renderer = m_firstChild; renderer; renderer = renderer->nextSibling()) {
         if (!renderer->firstChild() && !renderer->isInline() && !renderer->isBlockFlow() 
             || renderer->style()->visibility() != VISIBLE)
             continue;
-
-        int absx, absy;
-        renderer->absolutePositionForContent(absx, absy);
-        
-        int top = absy + borderTop() + paddingTop();
+        
+        int top = borderTop() + paddingTop() + isTableRow() ? 0 : renderer->xPos();
         int bottom = top + renderer->contentHeight();
-        int left = absx + borderLeft() + paddingLeft();
+        int left = borderLeft() + paddingLeft() + isTableRow() ? 0 : renderer->yPos();
         int right = left + renderer->contentWidth();
         
-        if (x <= right && x >= left && y <= top && y >= bottom)
-            return renderer->positionForCoordinates(x, y);
-        
+        if (x <= right && x >= left && y <= top && y >= bottom) {
+            if (renderer->isTableRow())
+                return renderer->positionForCoordinates(x + newX - renderer->xPos(), y + newY - renderer->yPos());
+            return renderer->positionForCoordinates(x - renderer->xPos(), y - renderer->yPos());
+        }
+
         // Find the distance from (x, y) to the box.  Split the space around the box into 8 pieces
         // and use a different compare depending on which piece (x, y) is in.
@@ -610 +611 @@
     
     if (closestRenderer)
-        return closestRenderer->positionForCoordinates(x, y);
+        return closestRenderer->positionForCoordinates(newX - closestRenderer->xPos(), newY - closestRenderer->yPos());
     
     return VisiblePosition(element(), 0, DOWNSTREAM);

trunk/WebCore/rendering/RenderFlow.cpp

@@ -434 +434 @@
             bool inside = curr->nodeAtPoint(request, result, x, y, tx, ty);
             if (inside) {
-                setInnerNode(result);
+                updateHitTestResult(result, IntPoint(x - tx, y - ty));
                 return true;
             }

trunk/WebCore/rendering/RenderInline.cpp

@@ -355 +355 @@
 VisiblePosition RenderInline::positionForCoordinates(int x, int y)
 {
+    // Translate the coords from the pre-anonymous block to the post-anonymous block.
+    RenderBlock* cb = containingBlock();
+    int parentBlockX = cb->xPos() + x;
+    int parentBlockY = cb->yPos() + y;
     for (RenderObject* c = continuation(); c; c = c->continuation()) {
+        RenderObject* contBlock = c;
+        if (c->isInline())
+            contBlock = c->containingBlock();
         if (c->isInline() || c->firstChild())
-            return c->positionForCoordinates(x, y);
+            return c->positionForCoordinates(parentBlockX - contBlock->xPos(), parentBlockY - contBlock->yPos());
     }
 

trunk/WebCore/rendering/RenderLayer.cpp

@@ -872 +872 @@
         HitTestResult result(currentPos);
         if (hitTest(request, result)) {
-            VisiblePosition pos(result.innerNode()->renderer()->positionForPoint(currentPos));
+            VisiblePosition pos(result.innerNode()->renderer()->positionForPoint(result.localPoint()));
             currentFrame->eventHandler()->updateSelectionForMouseDragOverPosition(pos);
         }
@@ -1590 +1590 @@
     // exited the WebView, and so hit testing over a scrollbar hits the content document.
     if ((request.active || request.mouseUp) && renderer()->isRenderView()) {
-        renderer()->setInnerNode(result);
+        renderer()->updateHitTestResult(result, result.point());
         return this;
     }

trunk/WebCore/rendering/RenderObject.cpp

@@ -2610 +2610 @@
 }
 
-void RenderObject::setInnerNode(HitTestResult& result)
+void RenderObject::updateHitTestResult(HitTestResult& result, const IntPoint& point)
 {
     if (result.innerNode())
@@ -2616 +2616 @@
 
     Node* node = element();
+    IntPoint localPoint(point);
     if (isRenderView())
         node = document()->documentElement();
@@ -2625 +2626 @@
 
     if (node) {
+        if (node->renderer()->continuation() && node->renderer() != this) {
+            // We're in the continuation of a split inline.  Adjust our local point to be in the coordinate space
+            // of the principal renderer's containing block.  This will end up being the innerNonSharedNode.
+            RenderObject* firstBlock = node->renderer()->containingBlock();
+            
+            // Get our containing block.
+            RenderObject* block = this;
+            if (isInline())
+                block = containingBlock();
+        
+            localPoint.move(block->xPos() - firstBlock->xPos(), block->yPos() - firstBlock->yPos());
+        }
+
         result.setInnerNode(node);
         if (!result.innerNonSharedNode())
             result.setInnerNonSharedNode(node);
+        result.setLocalPoint(localPoint);
     }
 }

trunk/WebCore/rendering/RenderObject.h

@@ -527 +527 @@
     bool hitTest(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestFilter = HitTestAll);
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
-    void setInnerNode(HitTestResult&);
+    void updateHitTestResult(HitTestResult&, const IntPoint&);
 
     virtual VisiblePosition positionForCoordinates(int x, int y);

trunk/WebCore/rendering/RenderPath.cpp

@@ -228 +228 @@
         if ((hitRules.canHitStroke && (style()->svgStyle()->hasStroke() || !hitRules.requireStroke) && strokeContains(hitPoint, hitRules.requireStroke))
             || (hitRules.canHitFill && (style()->svgStyle()->hasFill() || !hitRules.requireFill) && fillContains(hitPoint, hitRules.requireFill))) {
-            setInnerNode(result);
+            updateHitTestResult(result, IntPoint(_x, _y));
             return true;
         }

trunk/WebCore/rendering/RenderReplaced.cpp

@@ -119 +119 @@
 }
 
-VisiblePosition RenderReplaced::positionForCoordinates(int _x, int _y)
-{
-    InlineBox *box = inlineBoxWrapper();
+VisiblePosition RenderReplaced::positionForCoordinates(int x, int y)
+{
+    InlineBox* box = inlineBoxWrapper();
     if (!box)
         return VisiblePosition(element(), 0, DOWNSTREAM);
 
-    RootInlineBox *root = box->root();
-
-    int absx, absy;
-    containingBlock()->absolutePosition(absx, absy);
-
-    int top = absy + root->topOverflow();
-    int bottom = root->nextRootBox() ? absy + root->nextRootBox()->topOverflow() : absy + root->bottomOverflow();
-
-    if (_y < top)
+    // FIXME: This code is buggy if the replaced element is relative positioned.
+
+    RootInlineBox* root = box->root();
+
+    int top = root->topOverflow();
+    int bottom = root->nextRootBox() ? root->nextRootBox()->topOverflow() : root->bottomOverflow();
+
+    if (y + yPos() < top)
         return VisiblePosition(element(), caretMinOffset(), DOWNSTREAM); // coordinates are above
     
-    if (_y >= bottom)
+    if (y + yPos() >= bottom)
         return VisiblePosition(element(), caretMaxOffset(), DOWNSTREAM); // coordinates are below
     
     if (element()) {
-        if (_x <= absx + xPos() + (width() / 2))
+        if (x <= width() / 2)
             return VisiblePosition(element(), 0, DOWNSTREAM);
-
         return VisiblePosition(element(), 1, DOWNSTREAM);
     }
 
-    return RenderBox::positionForCoordinates(_x, _y);
+    return RenderBox::positionForCoordinates(x, y);
 }
 

trunk/WebCore/rendering/RenderTableRow.cpp

@@ -148 +148 @@
         // then we can remove this check.
         if (!child->layer() && !child->isInlineFlow() && child->nodeAtPoint(request, result, x, y, tx, ty, action)) {
-            setInnerNode(result);
+            updateHitTestResult(result, IntPoint(x - tx, y - ty));
             return true;
         }

trunk/WebCore/rendering/RenderTableSection.cpp

@@ -1003 +1003 @@
         // then we can remove this check.
         if (!child->layer() && !child->isInlineFlow() && child->nodeAtPoint(request, result, x, y, tx, ty, action)) {
-            setInnerNode(result);
+            updateHitTestResult(result, IntPoint(x - tx, y - ty));
             return true;
         }

trunk/WebCore/rendering/RenderText.cpp

@@ -209 +209 @@
         return VisiblePosition(element(), 0, DOWNSTREAM);
 
-    int absx, absy;
-    RenderBlock* cb = containingBlock();
-    cb->absolutePositionForContent(absx, absy);
-    if (cb->hasOverflowClip())
-        cb->layer()->subtractScrollOffset(absx, absy);
-
     // Get the offset for the position, since this will take rtl text into account.
     int offset;
 
     // FIXME: We should be able to roll these special cases into the general cases in the loop below.
-    if (firstTextBox() && y < absy + firstTextBox()->root()->bottomOverflow() && x < absx + firstTextBox()->m_x) {
+    if (firstTextBox() && y <  firstTextBox()->root()->bottomOverflow() && x < firstTextBox()->m_x) {
         // at the y coordinate of the first line or above
         // and the x coordinate is to the left of the first text box left edge
-        offset = firstTextBox()->offsetForPosition(x - absx);
+        offset = firstTextBox()->offsetForPosition(x);
         return VisiblePosition(element(), offset + firstTextBox()->m_start, DOWNSTREAM);
     }
-    if (lastTextBox() && y >= absy + lastTextBox()->root()->topOverflow() && x >= absx + lastTextBox()->m_x + lastTextBox()->m_width) {
+    if (lastTextBox() && y >= lastTextBox()->root()->topOverflow() && x >= lastTextBox()->m_x + lastTextBox()->m_width) {
         // at the y coordinate of the last line or below
         // and the x coordinate is to the right of the last text box right edge
-        offset = lastTextBox()->offsetForPosition(x - absx);
+        offset = lastTextBox()->offsetForPosition(x);
         return VisiblePosition(element(), offset + lastTextBox()->m_start, DOWNSTREAM);
     }
@@ -234 +228 @@
     InlineTextBox* lastBoxAbove = 0;
     for (InlineTextBox* box = firstTextBox(); box; box = box->nextTextBox()) {
-        if (y >= absy + box->root()->topOverflow()) {
-            if (y < absy + box->root()->bottomOverflow()) {
-                offset = box->offsetForPosition(x - absx);
-
-                if (x == absx + box->m_x)
+        if (y >= box->root()->topOverflow()) {
+            if (y < box->root()->bottomOverflow()) {
+                offset = box->offsetForPosition(x);
+
+                if (x == box->m_x)
                     // the x coordinate is equal to the left edge of this box
                     // the affinity must be downstream so the position doesn't jump back to the previous line
                     return VisiblePosition(element(), offset + box->m_start, DOWNSTREAM);
 
-                if (x < absx + box->m_x + box->m_width)
+                if (x < box->m_x + box->m_width)
                     // and the x coordinate is to the left of the right edge of this box
                     // check to see if position goes in this box
                     return VisiblePosition(element(), offset + box->m_start, offset > 0 ? VP_UPSTREAM_IF_POSSIBLE : DOWNSTREAM);
 
-                if (!box->prevOnLine() && x < absx + box->m_x)
+                if (!box->prevOnLine() && x < box->m_x)
                     // box is first on line
                     // and the x coordinate is to the left of the first text box left edge

trunk/WebCore/rendering/RootInlineBox.cpp

@@ -147 +147 @@
     if (m_ellipsisBox && object()->style()->visibility() == VISIBLE) {
         if (m_ellipsisBox->nodeAtPoint(request, result, x, y, tx, ty)) {
-            object()->setInnerNode(result);
+            object()->updateHitTestResult(result, IntPoint(x - tx, y - ty));
             return true;
         }
@@ -287 +287 @@
 }
 
-InlineBox* RootInlineBox::closestLeafChildForXPos(int x, int tx)
+InlineBox* RootInlineBox::closestLeafChildForXPos(int x)
 {
     InlineBox* firstLeaf = firstLeafChildAfterBox();
@@ -295 +295 @@
 
     // Avoid returning a list marker when possible.
-    if (x <= tx + firstLeaf->m_x && !firstLeaf->object()->isListMarker())
+    if (x <= firstLeaf->m_x && !firstLeaf->object()->isListMarker())
         // The x coordinate is less or equal to left edge of the firstLeaf.
         // Return it.
         return firstLeaf;
 
-    if (x >= tx + lastLeaf->m_x + lastLeaf->m_width && !lastLeaf->object()->isListMarker())
+    if (x >= lastLeaf->m_x + lastLeaf->m_width && !lastLeaf->object()->isListMarker())
         // The x coordinate is greater or equal to right edge of the lastLeaf.
         // Return it.
@@ -307 +307 @@
     for (InlineBox* leaf = firstLeaf; leaf && leaf != lastLeaf; leaf = leaf->nextLeafChild()) {
         if (!leaf->object()->isListMarker()) {
-            int leafX = tx + leaf->m_x;
+            int leafX = leaf->m_x;
             if (x < leafX + leaf->m_width)
                 // The x coordinate is less than the right edge of the box.

trunk/WebCore/rendering/RootInlineBox.h

@@ -122 +122 @@
     int selectionHeight() { return max(0, selectionBottom() - selectionTop()); }
 
-    InlineBox* closestLeafChildForXPos(int x, int tx);
+    InlineBox* closestLeafChildForXPos(int x);
 
 protected: