Changeset 150686 in webkit

Timestamp:

May 25, 2013 3:27:37 AM (11 years ago)

Author:

akling@apple.com

Message:

Begin moving "focus" state logic from Node to Element.
<​http://webkit.org/b/116760>

Reviewed by Antti Koivisto.

Only Elements can be focused, so merge the "focus" state logic from Node and ContainerNode
and move it into Element. There's a lot more iceberg under this tip, but we'll be starting
with setFocus(bool) and focused().

• dom/Node.h:
• dom/ContainerNode.cpp:
• dom/ContainerNode.h:
• dom/Element.cpp:

(WebCore::Element::isUserActionElementFocused):
(WebCore::Element::setFocus):

• dom/Element.h:

(WebCore::Element::focused):

• dom/Node.cpp:

Move focused() and setFocus(bool) from Node/ContainerNode to Element.

• dom/Document.cpp:

(WebCore::Document::setFocusedNode):

• page/EventHandler.cpp:

(WebCore::EventHandler::dispatchMouseEvent):

Check if the inspected Node is an Element before asking if it's focused.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (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) (1 diff)
• dom/Element.h (modified) (2 diffs)
• dom/Node.cpp (modified) (2 diffs)
• dom/Node.h (modified) (2 diffs)
• dom/UserActionElementSet.h (modified) (1 diff)
• page/EventHandler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-25  Andreas Kling  <akling@apple.com>
+
+        Begin moving "focus" state logic from Node to Element.
+        <http://webkit.org/b/116760>
+
+        Reviewed by Antti Koivisto.
+
+        Only Elements can be focused, so merge the "focus" state logic from Node and ContainerNode
+        and move it into Element. There's a lot more iceberg under this tip, but we'll be starting
+        with setFocus(bool) and focused().
+
+        * dom/Node.h:
+        * dom/ContainerNode.cpp:
+        * dom/ContainerNode.h:
+        * dom/Element.cpp:
+        (WebCore::Element::isUserActionElementFocused):
+        (WebCore::Element::setFocus):
+        * dom/Element.h:
+        (WebCore::Element::focused):
+        * dom/Node.cpp:
+
+            Move focused() and setFocus(bool) from Node/ContainerNode to Element.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedNode):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::dispatchMouseEvent):
+
+            Check if the inspected Node is an Element before asking if it's focused.
+
 2013-05-25  Noam Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -969 +969 @@
 }
 
-void ContainerNode::setFocus(bool received)
-{
-    if (focused() == received)
-        return;
-
-    Node::setFocus(received);
-
-    // note that we need to recalc the style
-    setNeedsStyleRecalc();
-}
-
 void ContainerNode::setActive(bool down, bool pause)
 {

trunk/Source/WebCore/dom/ContainerNode.h

@@ -110 +110 @@
     virtual void detach() OVERRIDE;
     virtual LayoutRect boundingBox() const OVERRIDE;
-    virtual void setFocus(bool) OVERRIDE;
     virtual void setActive(bool active = true, bool pause = false) OVERRIDE;
     virtual void scheduleSetNeedsStyleRecalc(StyleChangeType = FullStyleChange) OVERRIDE FINAL;

trunk/Source/WebCore/dom/Document.cpp

@@ -3342 +3342 @@
             oldFocusedNode->setActive(false);
 
-        oldFocusedNode->setFocus(false);
+        if (oldFocusedNode->isElementNode())
+            toElement(oldFocusedNode.get())->setFocus(false);
 
         // Dispatch a change event for text fields or textareas that have been edited
@@ -3420 +3421 @@
             goto SetFocusedNodeDone;
         }
-        m_focusedNode->setFocus(true);
+
+        if (m_focusedNode->isElementNode())
+            toElement(m_focusedNode.get())->setFocus(true);
 
         if (m_focusedNode->isRootEditableElement())

trunk/Source/WebCore/dom/Element.cpp

@@ -403 +403 @@
 }
 
+bool Element::isUserActionElementFocused() const
+{
+    ASSERT(isUserActionElement());
+    return document()->userActionElements().isFocused(this);
+}
+
 bool Element::isUserActionElementHovered() const
 {
     ASSERT(isUserActionElement());
     return document()->userActionElements().isHovered(this);
+}
+
+void Element::setFocus(bool flag)
+{
+    if (flag == focused())
+        return;
+
+    if (Document* document = this->document())
+        document->userActionElements().setFocused(this, flag);
+
+    setNeedsStyleRecalc();
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -428 +428 @@
 
     bool hovered() const { return isUserActionElement() && isUserActionElementHovered(); }
+    bool focused() const { return isUserActionElement() && isUserActionElementFocused(); }
+
     virtual void setHovered(bool flag = true);
+    virtual void setFocus(bool flag);
 
     RenderStyle* computedStyle(PseudoId = NOPSEUDO);
@@ -658 +661 @@
 
 private:
+    bool isUserActionElementFocused() const;
     bool isUserActionElementHovered() const;
 

trunk/Source/WebCore/dom/Node.cpp

@@ -2738 +2738 @@
 }
 
-void Node::setFocus(bool flag)
-{
-    if (Document* document = this->document())
-        document->userActionElements().setFocused(this, flag);
-}
-
 void Node::setActive(bool flag, bool)
 {
@@ -2762 +2756 @@
 }
 
-bool Node::isUserActionElementFocused() const
-{
-    ASSERT(isUserActionElement());
-    return document()->userActionElements().isFocused(this);
-}
-
 } // namespace WebCore
 

trunk/Source/WebCore/dom/Node.h

@@ -361 +361 @@
     bool active() const { return isUserActionElement() && isUserActionElementActive(); }
     bool inActiveChain() const { return isUserActionElement() && isUserActionElementInActiveChain(); }
-    bool focused() const { return isUserActionElement() && isUserActionElementFocused(); }
 
     bool attached() const { return getFlag(IsAttachedFlag); }
@@ -399 +398 @@
     void lazyReattach(ShouldSetAttached = SetAttached);
 
-    virtual void setFocus(bool flag);
     virtual void setActive(bool flag = true, bool pause = false);
 

trunk/Source/WebCore/dom/UserActionElementSet.h

@@ -43 +43 @@
     static PassOwnPtr<UserActionElementSet> create() { return adoptPtr(new UserActionElementSet()); }
 
-    bool isFocused(const Node* node) { return hasFlags(node, IsFocusedFlag); }
+    bool isFocused(const Element* element) { return hasFlags(element, IsFocusedFlag); }
     bool isActive(const Node* node) { return hasFlags(node, IsActiveFlag); }
     bool isInActiveChain(const Node* node) { return hasFlags(node, InActiveChainFlag); }
-    bool isHovered(const Node* node) { return hasFlags(node, IsHoveredFlag); }
-    void setFocused(Node* node, bool enable) { setFlags(node, enable, IsFocusedFlag); }
+    bool isHovered(const Element* element) { return hasFlags(element, IsHoveredFlag); }
+    void setFocused(Element* element, bool enable) { setFlags(element, enable, IsFocusedFlag); }
     void setActive(Node* node, bool enable) { setFlags(node, enable, IsActiveFlag); }
     void setInActiveChain(Node* node, bool enable) { setFlags(node, enable, InActiveChainFlag); }

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2361 +2361 @@
                 if (!page->focusController()->setFocusedNode(node, m_frame))
                     swallowEvent = true;
-            } else if (!node || !node->focused()) {
+            } else if (!node || !node->isElementNode() || !toElement(node)->focused()) {
                 if (!page->focusController()->setFocusedNode(0, m_frame))
                     swallowEvent = true;