Changeset 150684 in webkit

Timestamp:

May 25, 2013 2:16:30 AM (11 years ago)

Author:

akling@apple.com

Message:

Move "hover" state logic from Node to Element.
<​http://webkit.org/b/116757>

Reviewed by Antti Koivisto.

Resolve a 7 year old FIXME by merging the "hover" state logic from Node and ContainerNode
and moving it all to Element instead.

• dom/Node.cpp:

(WebCore::Node::detach):

• dom/Element.cpp:

(WebCore::Element::detach):

Move Document::hoveredNodeDetached() call from Node::detach() to Element::detach().

(WebCore::Element::isUserActionElementHovered):
(WebCore::Element::setHovered):

• dom/Element.h:

(WebCore::Element::hovered):

Moved here from Node/ContainerNode.

• dom/UserActionElementSet.h:

(WebCore::UserActionElementSet::setHovered):
(WebCore::UserActionElementSet::setFlags):

Make setHovered() take an Element* instead of a Node*. I'd like to do this will all
of these methods eventually, so added a setFlags() helper with the tighter type.

• html/HTMLLabelElement.h:
• html/shadow/SpinButtonElement.h:

Sprinkle OVERRIDE on setHovered() overrides.

• dom/Document.cpp:

(WebCore::Document::updateHoverActiveState):

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::isHovered):

• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::isHovered):

Check if the inspected Node is an element before asking if it's hovered.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityNodeObject.cpp (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (1 diff)
• dom/ContainerNode.h (modified) (1 diff)
• dom/Document.cpp (modified) (2 diffs)
• dom/Element.cpp (modified) (3 diffs)
• dom/Element.h (modified) (2 diffs)
• dom/Node.cpp (modified) (3 diffs)
• dom/Node.h (modified) (3 diffs)
• dom/UserActionElementSet.cpp (modified) (3 diffs)
• dom/UserActionElementSet.h (modified) (2 diffs)
• html/HTMLLabelElement.h (modified) (1 diff)
• html/shadow/SpinButtonElement.h (modified) (1 diff)
• rendering/RenderTheme.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-24  Andreas Kling  <akling@apple.com>
+
+        Move "hover" state logic from Node to Element.
+        <http://webkit.org/b/116757>
+
+        Reviewed by Antti Koivisto.
+
+        Resolve a 7 year old FIXME by merging the "hover" state logic from Node and ContainerNode
+        and moving it all to Element instead.
+
+        * dom/Node.cpp:
+        (WebCore::Node::detach):
+        * dom/Element.cpp:
+        (WebCore::Element::detach):
+
+            Move Document::hoveredNodeDetached() call from Node::detach() to Element::detach().
+
+        (WebCore::Element::isUserActionElementHovered):
+        (WebCore::Element::setHovered):
+        * dom/Element.h:
+        (WebCore::Element::hovered):
+
+            Moved here from Node/ContainerNode.
+
+        * dom/UserActionElementSet.h:
+        (WebCore::UserActionElementSet::setHovered):
+        (WebCore::UserActionElementSet::setFlags):
+
+            Make setHovered() take an Element* instead of a Node*. I'd like to do this will all
+            of these methods eventually, so added a setFlags() helper with the tighter type.
+
+        * html/HTMLLabelElement.h:
+        * html/shadow/SpinButtonElement.h:
+
+            Sprinkle OVERRIDE on setHovered() overrides.
+
+        * dom/Document.cpp:
+        (WebCore::Document::updateHoverActiveState):
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::isHovered):
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::isHovered):
+
+            Check if the inspected Node is an element before asking if it's hovered.
+
 2013-05-25  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -673 +673 @@
         return false;
 
-    return node->hovered();
+    return node->isElementNode() && toElement(node)->hovered();
 }
 

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -1030 +1030 @@
 }
 
-void ContainerNode::setHovered(bool over)
-{
-    if (over == hovered()) return;
-
-    Node::setHovered(over);
-
-    // note that we need to recalc the style
-    // FIXME: Move to Element
-    if (renderer()) {
-        if (renderStyle()->affectedByHover() || (isElementNode() && toElement(this)->childrenAffectedByHover()))
-            setNeedsStyleRecalc();
-        if (renderer() && renderer()->style()->hasAppearance())
-            renderer()->theme()->stateChanged(renderer(), HoverState);
-    }
-}
-
 unsigned ContainerNode::childNodeCount() const
 {

trunk/Source/WebCore/dom/ContainerNode.h

@@ -112 +112 @@
     virtual void setFocus(bool) OVERRIDE;
     virtual void setActive(bool active = true, bool pause = false) OVERRIDE;
-    virtual void setHovered(bool = true) OVERRIDE;
     virtual void scheduleSetNeedsStyleRecalc(StyleChangeType = FullStyleChange) OVERRIDE FINAL;
 

trunk/Source/WebCore/dom/Document.cpp

@@ -5970 +5970 @@
     size_t removeCount = nodesToRemoveFromChain.size();
     for (size_t i = 0; i < removeCount; ++i) {
-        nodesToRemoveFromChain[i]->setHovered(false);
+        if (nodesToRemoveFromChain[i]->isElementNode())
+            toElement(nodesToRemoveFromChain[i].get())->setHovered(false);
         if (event && (hasCapturingMouseLeaveListener || nodesToRemoveFromChain[i]->hasEventListeners(eventNames().mouseleaveEvent)))
             nodesToRemoveFromChain[i]->dispatchMouseEvent(*event, eventNames().mouseleaveEvent, 0, newHoverNode);
@@ -5984 +5985 @@
         if (!sawCommonAncestor) {
             // Elements after the common hover ancestor does not change hover state, but are iterated over because they may change active state.
-            nodesToAddToChain[i]->setHovered(true);
+            if (nodesToAddToChain[i]->isElementNode())
+                toElement(nodesToAddToChain[i].get())->setHovered(true);
             if (event && (hasCapturingMouseEnterListener || nodesToAddToChain[i]->hasEventListeners(eventNames().mouseenterEvent)))
                 nodesToAddToChain[i]->dispatchMouseEvent(*event, eventNames().mouseenterEvent, 0, oldHoverNode.get());

trunk/Source/WebCore/dom/Element.cpp

@@ -71 +71 @@
 #include "PseudoElement.h"
 #include "RenderRegion.h"
+#include "RenderTheme.h"
 #include "RenderView.h"
 #include "RenderWidget.h"
@@ -400 +401 @@
         return attribute->value();
     return nullAtom;
+}
+
+bool Element::isUserActionElementHovered() const
+{
+    ASSERT(isUserActionElement());
+    return document()->userActionElements().isHovered(this);
+}
+
+void Element::setHovered(bool flag)
+{
+    if (flag == hovered())
+        return;
+
+    if (Document* document = this->document())
+        document->userActionElements().setHovered(this, flag);
+
+    if (!renderer())
+        return;
+
+    if (renderer()->style()->affectedByHover() || childrenAffectedByHover())
+        setNeedsStyleRecalc();
+
+    if (renderer()->style()->hasAppearance())
+        renderer()->theme()->stateChanged(renderer(), HoverState);
 }
 
@@ -1327 +1352 @@
         shadow->detach();
     }
+
+    if (hovered())
+        document()->hoveredNodeDetached(this);
+
     ContainerNode::detach();
 }

trunk/Source/WebCore/dom/Element.h

@@ -427 +427 @@
     virtual const AtomicString& shadowPseudoId() const;
 
+    bool hovered() const { return isUserActionElement() && isUserActionElementHovered(); }
+    virtual void setHovered(bool flag = true);
+
     RenderStyle* computedStyle(PseudoId = NOPSEUDO);
 
@@ -655 +658 @@
 
 private:
+    bool isUserActionElementHovered() const;
+
     void updatePseudoElement(PseudoId, StyleChange = NoChange);
     PassRefPtr<PseudoElement> createPseudoElementIfNeeded(PseudoId);

trunk/Source/WebCore/dom/Node.cpp

@@ -1108 +1108 @@
     Document* doc = document();
     if (isUserActionElement()) {
-        if (hovered())
-            doc->hoveredNodeDetached(this);
         if (inActiveChain())
             doc->activeChainNodeDetached(this);
@@ -2752 +2750 @@
 }
 
-void Node::setHovered(bool flag)
-{
-    if (Document* document = this->document())
-        document->userActionElements().setHovered(this, flag);
-}
-
 bool Node::isUserActionElementActive() const
 {
@@ -2770 +2762 @@
 }
 
-bool Node::isUserActionElementHovered() const
-{
-    ASSERT(isUserActionElement());
-    return document()->userActionElements().isHovered(this);
-}
-
 bool Node::isUserActionElementFocused() const
 {

trunk/Source/WebCore/dom/Node.h

@@ -361 +361 @@
     bool active() const { return isUserActionElement() && isUserActionElementActive(); }
     bool inActiveChain() const { return isUserActionElement() && isUserActionElementInActiveChain(); }
-    bool hovered() const { return isUserActionElement() && isUserActionElementHovered(); }
     bool focused() const { return isUserActionElement() && isUserActionElementFocused(); }
 
@@ -402 +401 @@
     virtual void setFocus(bool flag);
     virtual void setActive(bool flag = true, bool pause = false);
-    virtual void setHovered(bool flag = true);
 
     virtual short tabIndex() const;
@@ -792 +790 @@
     bool isUserActionElementActive() const;
     bool isUserActionElementInActiveChain() const;
-    bool isUserActionElementHovered() const;
     bool isUserActionElementFocused() const;
 

trunk/Source/WebCore/dom/UserActionElementSet.cpp

@@ -73 +73 @@
 }
 
-inline bool UserActionElementSet::hasFlags(const Element* element, unsigned flags) const
+bool UserActionElementSet::hasFlags(const Element* element, unsigned flags) const
 {
     ASSERT(element->isUserActionElement());
@@ -82 +82 @@
 }
 
-inline void UserActionElementSet::clearFlags(Element* element, unsigned flags)
+void UserActionElementSet::clearFlags(Element* element, unsigned flags)
 {
     if (!element->isUserActionElement()) {
@@ -105 +105 @@
 }
 
-inline void UserActionElementSet::setFlags(Element* element, unsigned flags)
+void UserActionElementSet::setFlags(Element* element, unsigned flags)
 {
     ElementFlagMap::iterator result = m_elements.find(element);

trunk/Source/WebCore/dom/UserActionElementSet.h

@@ -50 +50 @@
     void setActive(Node* node, bool enable) { setFlags(node, enable, IsActiveFlag); }
     void setInActiveChain(Node* node, bool enable) { setFlags(node, enable, InActiveChainFlag); }
-    void setHovered(Node* node, bool enable) { setFlags(node, enable, IsHoveredFlag); }
+    void setHovered(Element* element, bool enable) { setFlags(element, enable, IsHoveredFlag); }
 
     UserActionElementSet();
@@ -71 +71 @@
     bool hasFlags(const Node*, unsigned flags) const;
 
+    void setFlags(Element* element, bool enable, unsigned flags) { enable ? setFlags(element, flags) : clearFlags(element, flags); }
     void setFlags(Element*, unsigned);
     void clearFlags(Element*, unsigned);

trunk/Source/WebCore/html/HTMLLabelElement.h

@@ -48 +48 @@
     // Overridden to update the hover/active state of the corresponding control.
     virtual void setActive(bool = true, bool pause = false);
-    virtual void setHovered(bool = true);
+    virtual void setHovered(bool = true) OVERRIDE;
 
     // Overridden to either click() or focus() the corresponding control.

trunk/Source/WebCore/html/shadow/SpinButtonElement.h

@@ -82 +82 @@
     void stopRepeatingTimer();
     void repeatingTimerFired(Timer<SpinButtonElement>*);
-    virtual void setHovered(bool = true);
+    virtual void setHovered(bool = true) OVERRIDE;
     bool shouldRespondToMouseEvents();
     virtual bool isMouseFocusable() const { return false; }

trunk/Source/WebCore/rendering/RenderTheme.cpp

@@ -832 +832 @@
 {
     Node* node = o->node();
-    if (!node)
-        return false;
-    if (!node->isElementNode() || !toElement(node)->isSpinButtonElement())
-        return node->hovered();
+    if (!node || !node->isElementNode())
+        return false;
+    if (!toElement(node)->isSpinButtonElement())
+        return toElement(node)->hovered();
     SpinButtonElement* element = static_cast<SpinButtonElement*>(node);
     return element->hovered() && element->upDownState() != SpinButtonElement::Indeterminate;