Changeset 150712 in webkit

Timestamp:

May 26, 2013 4:39:01 AM (11 years ago)

Author:

akling@apple.com

Message:

FocusController::setFocusedNode() should be setFocusedElement().
<​http://webkit.org/b/116780>

Reviewed by Antti Koivisto.

Source/WebCore:

Only Elements can have focus, so make the public API of FocusController take Element*.

• WebCore.exp.in:
• page/FocusController.h:
• page/FocusController.cpp:

(WebCore::FocusController::setFocusedElement):

Out with the setFocusedNode(), in with the setFocusedElement().

• dom/Element.cpp:

(WebCore::Element::focus):
(WebCore::Element::blur):

• page/EventHandler.cpp:

(WebCore::EventHandler::dispatchMouseEvent):

• plugins/PluginView.cpp:

(WebCore::PluginView::focusPluginElement):

• editing/FrameSelection.cpp:

(WebCore::FrameSelection::setFocusedNodeIfNeeded):

Tweak for FocusController taking Element* instead of Node*.

(WebCore::FrameSelection::setFocusedElementIfNeeded):

Renamed from setFocusedNodeIfNeeded().

• editing/htmlediting.h:
• editing/htmlediting.cpp:

(WebCore::enclosingAnchorElement):

Cleaned up the loop for readability and made it return an Element.

Source/WebKit/blackberry:

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::clearFocusNode):
(BlackBerry::WebKit::WebPage::setNodeFocus):

• WebKitSupport/SelectionHandler.cpp:

(BlackBerry::WebKit::SelectionHandler::selectObject):

Source/WebKit/win:

• WebView.cpp:

(WebView::clearFocusNode):

Source/WebKit2:

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::focusPluginElement):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/dom/Element.cpp (modified) (2 diffs)
• WebCore/editing/FrameSelection.cpp (modified) (5 diffs)
• WebCore/editing/FrameSelection.h (modified) (2 diffs)
• WebCore/editing/htmlediting.cpp (modified) (1 diff)
• WebCore/editing/htmlediting.h (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (1 diff)
• WebCore/page/FocusController.cpp (modified) (5 diffs)
• WebCore/page/FocusController.h (modified) (1 diff)
• WebCore/plugins/PluginView.cpp (modified) (1 diff)
• WebKit/blackberry/Api/WebPage.cpp (modified) (2 diffs)
• WebKit/blackberry/ChangeLog (modified) (1 diff)
• WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-26  Andreas Kling  <akling@apple.com>
+
+        FocusController::setFocusedNode() should be setFocusedElement().
+        <http://webkit.org/b/116780>
+
+        Reviewed by Antti Koivisto.
+
+        Only Elements can have focus, so make the public API of FocusController take Element*.
+
+        * WebCore.exp.in:
+        * page/FocusController.h:
+        * page/FocusController.cpp:
+        (WebCore::FocusController::setFocusedElement):
+
+            Out with the setFocusedNode(), in with the setFocusedElement().
+
+        * dom/Element.cpp:
+        (WebCore::Element::focus):
+        (WebCore::Element::blur):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::dispatchMouseEvent):
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::focusPluginElement):
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::setFocusedNodeIfNeeded):
+
+            Tweak for FocusController taking Element* instead of Node*.
+
+        (WebCore::FrameSelection::setFocusedElementIfNeeded):
+
+            Renamed from setFocusedNodeIfNeeded().
+
+        * editing/htmlediting.h:
+        * editing/htmlediting.cpp:
+        (WebCore::enclosingAnchorElement):
+
+            Cleaned up the loop for readability and made it return an Element.
+
 2013-05-26  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -433 +433 @@
 __ZN7WebCore15DatabaseManager9setClientEPNS_21DatabaseManagerClientE
 __ZN7WebCore15FocusController10setFocusedEb
-__ZN7WebCore15FocusController14setFocusedNodeEPNS_4NodeEN3WTF10PassRefPtrINS_5FrameEEENS_14FocusDirectionE
+__ZN7WebCore15FocusController17setFocusedElementEPNS_7ElementEN3WTF10PassRefPtrINS_5FrameEEENS_14FocusDirectionE
 __ZN7WebCore15FocusController15setFocusedFrameEN3WTF10PassRefPtrINS_5FrameEEE
 __ZN7WebCore15FocusController15setInitialFocusENS_14FocusDirectionEPNS_13KeyboardEventE

trunk/Source/WebCore/dom/Element.cpp

@@ -2035 +2035 @@
         // does not make sense to continue and update appearence.
         protect = this;
-        if (!page->focusController()->setFocusedNode(this, doc->frame(), direction))
+        if (!page->focusController()->setFocusedElement(this, doc->frame(), direction))
             return;
     }
@@ -2079 +2079 @@
     if (treeScope()->focusedNode() == this) {
         if (doc->frame())
-            doc->frame()->page()->focusController()->setFocusedNode(0, doc->frame());
+            doc->frame()->page()->focusController()->setFocusedElement(0, doc->frame());
         else
             doc->setFocusedNode(0);

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -312 +312 @@
     
     if (!s.isNone() && !(options & DoNotSetFocus))
-        setFocusedNodeIfNeeded();
+        setFocusedElementIfNeeded();
 
     if (!(options & DoNotUpdateAppearance)) {
@@ -1877 +1877 @@
 }
 
-void FrameSelection::setFocusedNodeIfNeeded()
+void FrameSelection::setFocusedElementIfNeeded()
 {
     if (isNone() || !isFocused())
@@ -1884 +1884 @@
     bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
     if (caretBrowsing) {
-        if (Node* anchor = enclosingAnchorElement(base())) {
-            m_frame->page()->focusController()->setFocusedNode(anchor, m_frame);
+        if (Element* anchor = enclosingAnchorElement(base())) {
+            m_frame->page()->focusController()->setFocusedElement(anchor, m_frame);
             return;
         }
@@ -1897 +1897 @@
             // work in the long term, but this is the safest fix at this time.
             if (target->isMouseFocusable() && !isFrameElement(target)) {
-                m_frame->page()->focusController()->setFocusedNode(target, m_frame);
+                m_frame->page()->focusController()->setFocusedElement(target, m_frame);
                 return;
             }
@@ -1906 +1906 @@
 
     if (caretBrowsing)
-        m_frame->page()->focusController()->setFocusedNode(0, m_frame);
+        m_frame->page()->focusController()->setFocusedElement(0, m_frame);
 }
 

trunk/Source/WebCore/editing/FrameSelection.h

@@ -237 +237 @@
     enum EndPointsAdjustmentMode { AdjustEndpointsAtBidiBoundary, DoNotAdjsutEndpoints };
     void setNonDirectionalSelectionIfNeeded(const VisibleSelection&, TextGranularity, EndPointsAdjustmentMode = DoNotAdjsutEndpoints);
-    void setFocusedNodeIfNeeded();
     void notifyRendererOfSelectionChange(EUserTriggered);
 
@@ -286 +285 @@
 #endif
 
+    void setFocusedElementIfNeeded();
     void focusedOrActiveStateChanged();
 

trunk/Source/WebCore/editing/htmlediting.cpp

@@ -675 +675 @@
 }
 
-Node* enclosingAnchorElement(const Position& p)
+Element* enclosingAnchorElement(const Position& p)
 {
     if (p.isNull())
         return 0;
-    
-    Node* node = p.deprecatedNode();
-    while (node && !(node->isElementNode() && node->isLink()))
-        node = node->parentNode();
-    return node;
+
+    for (Node* node = p.deprecatedNode(); node; node = node->parentNode()) {
+        if (node->isElementNode() && node->isLink())
+            return toElement(node);
+    }
+    return 0;
 }
 

trunk/Source/WebCore/editing/htmlediting.h

@@ -65 +65 @@
 Node* enclosingTableCell(const Position&);
 Node* enclosingEmptyListItem(const VisiblePosition&);
-Node* enclosingAnchorElement(const Position&);
+Element* enclosingAnchorElement(const Position&);
 Node* enclosingNodeWithTag(const Position&, const QualifiedName&);
 Node* enclosingNodeOfType(const Position&, bool (*nodeIsOfType)(const Node*), EditingBoundaryCrossingRule = CannotCrossEditingBoundary);

trunk/Source/WebCore/page/EventHandler.cpp

@@ -2363 +2363 @@
         if (Page* page = m_frame->page()) {
             if (element && element->isMouseFocusable()) {
-                if (!page->focusController()->setFocusedNode(element, m_frame))
+                if (!page->focusController()->setFocusedElement(element, m_frame))
                     swallowEvent = true;
             } else if (!element || !element->focused()) {
-                if (!page->focusController()->setFocusedNode(0, m_frame))
+                if (!page->focusController()->setFocusedElement(0, m_frame))
                     swallowEvent = true;
             }

trunk/Source/WebCore/page/FocusController.cpp

@@ -591 +591 @@
 }
 
-bool FocusController::setFocusedNode(Node* node, PassRefPtr<Frame> newFocusedFrame, FocusDirection direction)
+bool FocusController::setFocusedElement(Element* element, PassRefPtr<Frame> newFocusedFrame, FocusDirection direction)
 {
     RefPtr<Frame> oldFocusedFrame = focusedFrame();
@@ -597 +597 @@
     
     Node* oldFocusedNode = oldDocument ? oldDocument->focusedNode() : 0;
-    if (oldFocusedNode == node)
+    if (oldFocusedNode == element)
         return true;
 
@@ -606 +606 @@
     m_page->editorClient()->willSetInputMethodState();
 
-    clearSelectionIfNeeded(oldFocusedFrame.get(), newFocusedFrame.get(), node);
-
-    if (!node) {
+    clearSelectionIfNeeded(oldFocusedFrame.get(), newFocusedFrame.get(), element);
+
+    if (!element) {
         if (oldDocument)
             oldDocument->setFocusedNode(0);
@@ -615 +615 @@
     }
 
-    RefPtr<Document> newDocument = node->document();
-
-    if (newDocument && newDocument->focusedNode() == node) {
-        m_page->editorClient()->setInputMethodState(node->shouldUseInputMethod());
+    RefPtr<Document> newDocument = element->document();
+
+    if (newDocument && newDocument->focusedNode() == element) {
+        m_page->editorClient()->setInputMethodState(element->shouldUseInputMethod());
         return true;
     }
@@ -631 +631 @@
     setFocusedFrame(newFocusedFrame);
 
-    // Setting the focused node can result in losing our last reft to node when JS event handlers fire.
-    RefPtr<Node> protect = node;
+    RefPtr<Element> protect(element);
     if (newDocument) {
-        bool successfullyFocused = newDocument->setFocusedNode(node, direction);
+        bool successfullyFocused = newDocument->setFocusedNode(element, direction);
         if (!successfullyFocused)
             return false;
     }
 
-    if (newDocument->focusedNode() == node)
-        m_page->editorClient()->setInputMethodState(node->shouldUseInputMethod());
+    if (newDocument->focusedNode() == element)
+        m_page->editorClient()->setInputMethodState(element->shouldUseInputMethod());
 
     return true;

trunk/Source/WebCore/page/FocusController.h

@@ -70 +70 @@
     bool setInitialFocus(FocusDirection, KeyboardEvent*);
     bool advanceFocus(FocusDirection, KeyboardEvent*, bool initialFocus = false);
-        
-    bool setFocusedNode(Node*, PassRefPtr<Frame>, FocusDirection = FocusDirectionNone);
+
+    bool setFocusedElement(Element*, PassRefPtr<Frame>, FocusDirection = FocusDirectionNone);
 
     void setActive(bool);

trunk/Source/WebCore/plugins/PluginView.cpp

@@ -890 +890 @@
     // Focus the plugin
     if (Page* page = m_parentFrame->page())
-        page->focusController()->setFocusedNode(m_element, m_parentFrame);
+        page->focusController()->setFocusedElement(m_element, m_parentFrame);
     else
         m_parentFrame->document()->setFocusedNode(m_element);

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -4168 +4168 @@
 
     if (frame->document()->focusedNode())
-        frame->page()->focusController()->setFocusedNode(0, frame);
+        frame->page()->focusController()->setFocusedElement(0, frame);
 }
 
@@ -4908 +4908 @@
             // Modify if focusing on node or turning off focused node.
             if (on) {
-                page->focusController()->setFocusedNode(nodeImpl, doc->frame());
+                page->focusController()->setFocusedElement(toElement(nodeImpl), doc->frame());
                 if (nodeImpl->isElementNode())
                     toElement(nodeImpl)->updateFocusAppearance(true);
                 d->m_inputHandler->didNodeOpenPopup(nodeImpl);
             } else if (doc->focusedNode() == nodeImpl) // && !on
-                page->focusController()->setFocusedNode(0, doc->frame());
+                page->focusController()->setFocusedElement(0, doc->frame());
 
             return true;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-26  Andreas Kling  <akling@apple.com>
+
+        FocusController::setFocusedNode() should be setFocusedElement().
+        <http://webkit.org/b/116780>
+
+        Reviewed by Antti Koivisto.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::clearFocusNode):
+        (BlackBerry::WebKit::WebPage::setNodeFocus):
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::SelectionHandler::selectObject):
+
 2013-05-24  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp

@@ -892 +892 @@
 
     // Move focus to the new node if we're not selecting in old input field.
-    if (!m_webPage->m_inputHandler->boundingBoxForInputField().contains(relativePoint))
-        m_webPage->m_page->focusController()->setFocusedNode(selection.start().anchorNode(), focusedFrame);
+    if (!m_webPage->m_inputHandler->boundingBoxForInputField().contains(relativePoint)) {
+        Node* anchorNode = selection.start().anchorNode();
+        if (!anchorNode || anchorNode->isElementNode())
+            m_webPage->m_page->focusController()->setFocusedElement(toElement(anchorNode), focusedFrame);
+    }
 
     m_selectionActive = expandSelectionToGranularity(focusedFrame, selection, granularity, m_webPage->m_inputHandler->isInputMode());

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2013-05-26  Andreas Kling  <akling@apple.com>
+
+        FocusController::setFocusedNode() should be setFocusedElement().
+        <http://webkit.org/b/116780>
+
+        Reviewed by Antti Koivisto.
+
+        * WebView.cpp:
+        (WebView::clearFocusNode):
+
 2013-05-24  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/win/WebView.cpp

@@ -5275 +5275 @@
 {
     if (m_page && m_page->focusController())
-        m_page->focusController()->setFocusedNode(0, 0);
+        m_page->focusController()->setFocusedElement(0, 0);
     return S_OK;
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-26  Andreas Kling  <akling@apple.com>
+
+        FocusController::setFocusedNode() should be setFocusedElement().
+        <http://webkit.org/b/116780>
+
+        Reviewed by Antti Koivisto.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::focusPluginElement):
+
 2013-05-25  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -1033 +1033 @@
     
     if (Page* page = frame()->page())
-       page->focusController()->setFocusedNode(m_pluginElement.get(), frame());
+        page->focusController()->setFocusedElement(m_pluginElement.get(), frame());
     else
        frame()->document()->setFocusedNode(m_pluginElement);