Changeset 139199 in webkit


Ignore:
Timestamp:
Jan 9, 2013 9:41:10 AM (11 years ago)
Author:
morrita@google.com
Message:

Document::setActiveNode() should be Document::setActiveElement()
https://bugs.webkit.org/show_bug.cgi?id=106437

Reviewed by Ojan Vafai.

No new tests. No functoinal change.

  • dom/Document.cpp:

(WebCore::Document::setActiveElement):
(WebCore::Document::updateHoverActiveState):

  • dom/Document.h:

(Document):

  • rendering/HitTestResult.cpp:

(WebCore::HitTestResult::innerElement):
(WebCore):

  • rendering/HitTestResult.h:

(HitTestResult):

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r139198 r139199  
     12013-01-09  Hajime Morrita  <morrita@google.com>
     2
     3        Document::setActiveNode() should be Document::setActiveElement()
     4        https://bugs.webkit.org/show_bug.cgi?id=106437
     5
     6        Reviewed by Ojan Vafai.
     7
     8        No new tests. No functoinal change.
     9
     10        * dom/Document.cpp:
     11        (WebCore::Document::setActiveElement):
     12        (WebCore::Document::updateHoverActiveState):
     13        * dom/Document.h:
     14        (Document):
     15        * rendering/HitTestResult.cpp:
     16        (WebCore::HitTestResult::innerElement):
     17        (WebCore):
     18        * rendering/HitTestResult.h:
     19        (HitTestResult):
     20
    1212013-01-09  Shinya Kawanaka  <shinyak@chromium.org>
    222
  • trunk/Source/WebCore/dom/Document.cpp

    r139192 r139199  
    32363236}
    32373237
    3238 void Document::setActiveNode(PassRefPtr<Node> newActiveNode)
    3239 {
    3240     if (!newActiveNode) {
     3238void Document::setActiveElement(PassRefPtr<Element> newActiveElement)
     3239{
     3240    if (!newActiveElement) {
    32413241        m_activeElement.clear();
    32423242        return;
    32433243    }
    32443244
    3245     m_activeElement = newActiveNode->isElementNode() ? toElement(newActiveNode.get()) : newActiveNode->parentElement();
     3245    m_activeElement = newActiveElement;
    32463246}
    32473247
     
    58105810        return;
    58115811
    5812     Node* innerNodeInDocument = result.innerNode();
    5813     ASSERT(!innerNodeInDocument || innerNodeInDocument->document() == this);
    5814 
    5815     Node* oldActiveNode = activeElement();
    5816     if (oldActiveNode && !request.active()) {
     5812    Element* innerElementInDocument = result.innerElement();
     5813    ASSERT(!innerElementInDocument || innerElementInDocument->document() == this);
     5814
     5815    Element* oldActiveElement = activeElement();
     5816    if (oldActiveElement && !request.active()) {
    58175817        // We are clearing the :active chain because the mouse has been released.
    5818         for (RenderObject* curr = oldActiveNode->renderer(); curr; curr = curr->parent()) {
    5819             if (curr->node() && !curr->isText()) {
     5818        for (RenderObject* curr = oldActiveElement->renderer(); curr; curr = curr->parent()) {
     5819            if (curr->node()) {
     5820                ASSERT(!curr->node()->isTextNode());
    58205821                curr->node()->setActive(false);
    58215822                m_userActionElements.setInActiveChain(curr->node(), false);
    58225823            }
    58235824        }
    5824         setActiveNode(0);
     5825        setActiveElement(0);
    58255826    } else {
    5826         Node* newActiveNode = innerNodeInDocument;
    5827         if (!oldActiveNode && newActiveNode && request.active() && !request.touchMove()) {
     5827        Element* newActiveElement = innerElementInDocument;
     5828        if (!oldActiveElement && newActiveElement && request.active() && !request.touchMove()) {
    58285829            // We are setting the :active chain and freezing it. If future moves happen, they
    58295830            // will need to reference this chain.
    5830             for (RenderObject* curr = newActiveNode->renderer(); curr; curr = curr->parent()) {
     5831            for (RenderObject* curr = newActiveElement->renderer(); curr; curr = curr->parent()) {
    58315832                if (curr->node() && !curr->isText())
    58325833                    m_userActionElements.setInActiveChain(curr->node(), true);
    58335834            }
    58345835
    5835             setActiveNode(newActiveNode);
     5836            setActiveElement(newActiveElement);
    58365837        }
    58375838    }
    58385839    // If the mouse has just been pressed, set :active on the chain. Those (and only those)
    58395840    // nodes should remain :active until the mouse is released.
    5840     bool allowActiveChanges = !oldActiveNode && activeElement();
     5841    bool allowActiveChanges = !oldActiveElement && activeElement();
    58415842
    58425843    // If the mouse is down and if this is a mouse move event, we want to restrict changes in
     
    58615862    // Check to see if the hovered node has changed.
    58625863    // If it hasn't, we do not need to do anything.
    5863     Node* newHoverNode = innerNodeInDocument;
     5864    Node* newHoverNode = innerElementInDocument;
    58645865    while (newHoverNode && !newHoverNode->renderer())
    58655866        newHoverNode = newHoverNode->parentOrHostNode();
  • trunk/Source/WebCore/dom/Document.h

    r139141 r139199  
    700700    Node* hoverNode() const { return m_hoverNode.get(); }
    701701
    702     void setActiveNode(PassRefPtr<Node>);
     702    void setActiveElement(PassRefPtr<Element>);
    703703    Element* activeElement() const { return m_activeElement.get(); }
    704704
  • trunk/Source/WebCore/rendering/HitTestResult.cpp

    r136744 r139199  
    795795}
    796796
     797Element* HitTestResult::innerElement() const
     798{
     799    for (Node* node = m_innerNode.get(); node; node = node->parentNode()) {
     800        if (node->isElementNode())
     801            return toElement(node);
     802    }
     803
     804    return 0;
     805}
     806
    797807} // namespace WebCore
  • trunk/Source/WebCore/rendering/HitTestResult.h

    r135841 r139199  
    116116
    117117    Node* innerNode() const { return m_innerNode.get(); }
     118    Element* innerElement() const;
    118119    Node* innerNonSharedNode() const { return m_innerNonSharedNode.get(); }
    119120    Element* URLElement() const { return m_innerURLElement.get(); }
Note: See TracChangeset for help on using the changeset viewer.