ChangeLog

112012-10-02 Allan Sandfeld Jensen <allan.jensen@digia.com>

22

        Move side-effects on hover/active state out of hit-testing.

        https://bugs.webkit.org/show_bug.cgi?id=98168

        Reviewed by NOBODY (OOPS!).

        This patch changes hit-testing so that it no longer has any side-effects and is really purely

        a hit-test. This will help enable further clean-up and optimizations.

        No change in functionality. No new tests.

        * dom/Document.cpp:

        (WebCore::Document::prepareMouseEvent):

        (WebCore::Document::updateHoverActiveState):

        * dom/Document.h:

        (Document):

        * page/EventHandler.cpp:

        (WebCore::EventHandler::hitTestResultAtPoint):

        (WebCore::EventHandler::sendContextMenuEventForKey):

        (WebCore::EventHandler::hoverTimerFired):

        * rendering/RenderView.cpp:

        (WebCore::RenderView::hitTest):

2012-10-02  Allan Sandfeld Jensen  <allan.jensen@digia.com>

        Disambiguate resultFramePoint and original hit-test point

        https://bugs.webkit.org/show_bug.cgi?id=98139

Source/WebCore/dom/Document.cpp

@@MouseEventWithHitTestResults Document::prepareMouseEvent(const HitTestRequest& r

    renderView()->hitTest(request, result);

    if (!request.readOnly())

3072 update~~Sty~~l~~eIfNeeded~~();

3072 updateHoverActiveState(request, result.innerNode());

    return MouseEventWithHitTestResults(event, result);

}

@@static RenderObject* nearestCommonHoverAncestor(RenderObject* obj1, RenderObject

    return 0;

}

5763 void Document::updateHoverActiveState(const HitTestRequest& request, H~~itTestResult& result~~)

5763void Document::updateHoverActiveState(const HitTestRequest& request, Node* innerNode)

57645764{

    // We don't update :hover/:active state when the result is marked as readOnly.

    if (request.readOnly())

        return;

    Node* innerNodeInDocument = result.innerNode();

    ASSERT(!innerNodeInDocument || innerNodeInDocument->document() == this);

5765 ASSERT(!request.readOnly());

5766 ASSERT(!innerNode || innerNode->document() == this);

    Node* oldActiveNode = activeNode();

    if (oldActiveNode && !request.active()) {

@@void Document::updateHoverActiveState(const HitTestRequest& request, HitTestResu

        }

        setActiveNode(0);

    } else {

5783 Node* newActiveNode = innerNode~~InDocument~~;

5779 Node* newActiveNode = innerNode;

        if (!oldActiveNode && newActiveNode && request.active() && !request.touchMove()) {

            // We are setting the :active chain and freezing it. If future moves happen, they

            // will need to reference this chain.

@@void Document::updateHoverActiveState(const HitTestRequest& request, HitTestResu

    bool mustBeInActiveChain = request.active() && request.move();

    RefPtr<Node> oldHoverNode = hoverNode();

5804 ~~// Clear the :hover chain when the touch gesture is over.~~

5800

58055801 if (request.touchRelease()) {

        if (oldHoverNode) {

            for (RenderObject* curr = oldHoverNode->renderer(); curr; curr = curr->hoverAncestor()) {

                if (curr->node() && !curr->isText())

                    curr->node()->setHovered(false);

            }

            setHoverNode(0);

        }

        // A touch release can not set new hover or active target.

        return;

5802 // A touch release does not set a new hover target.

5803 innerNode = 0;

    }

    // Check to see if the hovered node has changed.

    // If it hasn't, we do not need to do anything.

5819 Node* newHoverNode = innerNode~~InDocument~~;

5808 Node* newHoverNode = innerNode;

    while (newHoverNode && !newHoverNode->renderer())

        newHoverNode = newHoverNode->parentOrHostNode();

@@void Document::updateHoverActiveState(const HitTestRequest& request, HitTestResu

            nodesToAddToChain[i]->setActive(true);

        nodesToAddToChain[i]->setHovered(true);

    }

5849

5850 updateStyleIfNeeded();

}

void Document::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const

Source/WebCore/dom/Document.h

@@public:

    void hoveredNodeDetached(Node*);

    void activeChainNodeDetached(Node*);

706 void updateHoverActiveState(const HitTestRequest&, H~~itTestResult&~~);

706 void updateHoverActiveState(const HitTestRequest&, Node* innerNode);

    // Updates for :target (CSS3 selector).

    void setCSSTarget(Element*);

Source/WebCore/page/EventHandler.cpp

@@HitTestResult EventHandler::hitTestResultAtPoint(const LayoutPoint& point, bool

        hitType |= HitTestRequest::IgnoreClipping;

    if (allowShadowContent)

        hitType |= HitTestRequest::AllowShadowContent;

1079 m_frame->contentRenderer()->hitTest(HitTestRequest(hitType), result);

    HitTestRequest request(hitType);

    m_frame->contentRenderer()->hitTest(request, result);

    if (!request.readOnly())

        m_frame->document()->updateHoverActiveState(request, result.innerNode());

    while (true) {

        Node* n = result.innerNode();

@@HitTestResult EventHandler::hitTestResultAtPoint(const LayoutPoint& point, bool

            result.localPoint().y() + view->scrollY() - renderWidget->borderTop() - renderWidget->paddingTop());

        HitTestResult widgetHitTestResult(widgetPoint, padding.height(), padding.width(), padding.height(), padding.width());

        widgetHitTestResult.setOriginalFramePoint(result.originalFramePoint());

1097 frame->contentRenderer()->hitTest(~~HitTestR~~equest~~(hitType)~~, widgetHitTestResult);

1100 frame->contentRenderer()->hitTest(request, widgetHitTestResult);

10981101 result = widgetHitTestResult;

1102 if (!request.readOnly())

1103 frame->document()->updateHoverActiveState(request, result.innerNode());

        if (testScrollbars == ShouldHitTestScrollbars) {

            Scrollbar* eventScrollbar = view->scrollbarAtPoint(roundedIntPoint(point));

@@bool EventHandler::sendContextMenuEventForKey()

        targetNode = doc;

    // Use the focused node as the target for hover and active.

    HitTestResult result(position);

    result.setInnerNode(targetNode);

    HitTestRequest request(HitTestRequest::Active);

    doc->updateHoverActiveState(request, result);

    doc->updateStyleIfNeeded();

2731 doc->updateHoverActiveState(HitTestRequest::Active, targetNode);

   
    // The contextmenu event is a mouse event even when invoked using the keyboard.

    // This is required for web compatibility.

@@void EventHandler::hoverTimerFired(Timer<EventHandler>*)

            HitTestRequest request(HitTestRequest::Move);

            HitTestResult result(view->windowToContents(m_currentMousePosition));

            renderer->hitTest(request, result);

2860 m_frame->document()->update~~Sty~~l~~eIfNeeded~~();

2861 m_frame->document()->updateHoverActiveState(request, result.innerNode());

Source/WebCore/rendering/RenderView.cpp

@@bool RenderView::hitTest(const HitTestRequest& request, const HitTestLocation& l

{

    bool inside = layer()->hitTest(request, location, result);

    // Next set up the correct :hover/:active state along the new chain.

    document()->updateHoverActiveState(request, result);

    return inside;

}