ChromeClient::focusedNodeChanged() should be focusedElementChanged().

<http://webkit.org/b/119110> Reviewed by Anders Carlsson. Source/WebCore: Because only Elements can be focused. * dom/Document.cpp: (WebCore::Document::setFocusedElement): * loader/EmptyClients.h: (WebCore::EmptyChromeClient::focusedElementChanged): * page/Chrome.cpp: (WebCore::Chrome::focusedElementChanged): * page/Chrome.h: * page/ChromeClient.h: Source/WebKit/blackberry: * WebCoreSupport/ChromeClientBlackBerry.cpp: (WebCore::ChromeClientBlackBerry::focusedElementChanged): * WebCoreSupport/ChromeClientBlackBerry.h: Source/WebKit/efl: * WebCoreSupport/ChromeClientEfl.cpp: (WebCore::ChromeClientEfl::focusedElementChanged): * WebCoreSupport/ChromeClientEfl.h: Source/WebKit/gtk: * WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::focusedElementChanged): * WebCoreSupport/ChromeClientGtk.h: Source/WebKit/mac: * WebCoreSupport/WebChromeClient.h: * WebCoreSupport/WebChromeClient.mm: (WebChromeClient::focusedElementChanged): Source/WebKit/qt: * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::focusedElementChanged): * WebCoreSupport/ChromeClientQt.h: Source/WebKit/win: * WebCoreSupport/WebChromeClient.cpp: (WebChromeClient::focusedElementChanged): * WebCoreSupport/WebChromeClient.h: Source/WebKit/wince: * WebCoreSupport/ChromeClientWinCE.cpp: (WebKit::ChromeClientWinCE::focusedElementChanged): * WebCoreSupport/ChromeClientWinCE.h: Source/WebKit2: * WebProcess/WebCoreSupport/WebChromeClient.cpp: (WebKit::WebChromeClient::focusedElementChanged): * WebProcess/WebCoreSupport/WebChromeClient.h: Canonical link: https://commits.webkit.org/137140@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153356 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jul 25, 2013 · f1f2947 · f1f2947
1 parent 7dc7b85
commit f1f2947
Show file tree

Hide file tree

Showing 30 changed files with 136 additions and 30 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2013-07-25  Andreas Kling  <akling@apple.com>
+
+        ChromeClient::focusedNodeChanged() should be focusedElementChanged().
+        <http://webkit.org/b/119110>
+
+        Reviewed by Anders Carlsson.
+
+        Because only Elements can be focused.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedElement):
+        * loader/EmptyClients.h:
+        (WebCore::EmptyChromeClient::focusedElementChanged):
+        * page/Chrome.cpp:
+        (WebCore::Chrome::focusedElementChanged):
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+
 2013-07-25  Kwang Yul Seo  <skyul@company100.net>
 
         [WK2][Soup] Add private browsing support

diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
@@ -3407,7 +3407,7 @@ bool Document::setFocusedElement(PassRefPtr<Element> prpNewFocusedElement, Focus
     }
 
     if (!focusChangeBlocked)
-        page()->chrome().focusedNodeChanged(m_focusedElement.get());
+        page()->chrome().focusedElementChanged(m_focusedElement.get());
 
 SetFocusedNodeDone:
     updateStyleIfNeeded();

diff --git a/Source/WebCore/loader/EmptyClients.h b/Source/WebCore/loader/EmptyClients.h
@@ -77,7 +77,7 @@ class EmptyChromeClient : public ChromeClient {
     virtual bool canTakeFocus(FocusDirection) { return false; }
     virtual void takeFocus(FocusDirection) { }
 
-    virtual void focusedNodeChanged(Node*) { }
+    virtual void focusedElementChanged(Element*) { }
     virtual void focusedFrameChanged(Frame*) { }
 
     virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&) { return 0; }

diff --git a/Source/WebCore/page/Chrome.cpp b/Source/WebCore/page/Chrome.cpp
@@ -178,9 +178,9 @@ void Chrome::takeFocus(FocusDirection direction) const
     m_client->takeFocus(direction);
 }
 
-void Chrome::focusedNodeChanged(Node* node) const
+void Chrome::focusedElementChanged(Element* element) const
 {
-    m_client->focusedNodeChanged(node);
+    m_client->focusedElementChanged(element);
 }
 
 void Chrome::focusedFrameChanged(Frame* frame) const

diff --git a/Source/WebCore/page/Chrome.h b/Source/WebCore/page/Chrome.h
@@ -44,12 +44,12 @@ class DateTimeChooserClient;
 class FileChooser;
 class FileIconLoader;
 class FloatRect;
+class Element;
 class Frame;
 class Geolocation;
 class HitTestResult;
 class IntRect;
 class NavigationAction;
-class Node;
 class Page;
 class PopupMenu;
 class PopupMenuClient;
@@ -107,7 +107,7 @@ class Chrome : public HostWindow {
     bool canTakeFocus(FocusDirection) const;
     void takeFocus(FocusDirection) const;
 
-    void focusedNodeChanged(Node*) const;
+    void focusedElementChanged(Element*) const;
     void focusedFrameChanged(Frame*) const;
 
     Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&) const;

diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
@@ -93,7 +93,7 @@ class ChromeClient {
     virtual bool canTakeFocus(FocusDirection) = 0;
     virtual void takeFocus(FocusDirection) = 0;
 
-    virtual void focusedNodeChanged(Node*) = 0;
+    virtual void focusedElementChanged(Element*) = 0;
     virtual void focusedFrameChanged(Frame*) = 0;
 
     // The Frame pointer provides the ChromeClient with context about which

diff --git a/Source/WebKit/blackberry/ChangeLog b/Source/WebKit/blackberry/ChangeLog
@@ -1,3 +1,14 @@
+2013-07-25  Andreas Kling  <akling@apple.com>
+
+        ChromeClient::focusedNodeChanged() should be focusedElementChanged().
+        <http://webkit.org/b/119110>
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/ChromeClientBlackBerry.cpp:
+        (WebCore::ChromeClientBlackBerry::focusedElementChanged):
+        * WebCoreSupport/ChromeClientBlackBerry.h:
+
 2013-07-17  Kangil Han  <kangil.han@samsung.com>
 
         Use toHTMLMediaElement

diff --git a/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp b/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.cpp
@@ -202,7 +202,7 @@ void ChromeClientBlackBerry::takeFocus(FocusDirection)
     notImplemented();
 }
 
-void ChromeClientBlackBerry::focusedNodeChanged(Node*)
+void ChromeClientBlackBerry::focusedElementChanged(Element*)
 {
     m_webPagePrivate->m_inputHandler->focusedNodeChanged();
 }

diff --git a/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h b/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h
@@ -42,7 +42,7 @@ class ChromeClientBlackBerry : public ChromeClient {
     virtual void unfocus();
     virtual bool canTakeFocus(FocusDirection);
     virtual void takeFocus(FocusDirection);
-    virtual void focusedNodeChanged(Node*);
+    virtual void focusedElementChanged(Element*);
     virtual void focusedFrameChanged(Frame*);
     virtual bool shouldForceDocumentStyleSelectorUpdate();
     virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&);

diff --git a/Source/WebKit/efl/ChangeLog b/Source/WebKit/efl/ChangeLog
@@ -1,3 +1,14 @@
+2013-07-25  Andreas Kling  <akling@apple.com>
+
+        ChromeClient::focusedNodeChanged() should be focusedElementChanged().
+        <http://webkit.org/b/119110>
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/ChromeClientEfl.cpp:
+        (WebCore::ChromeClientEfl::focusedElementChanged):
+        * WebCoreSupport/ChromeClientEfl.h:
+
 2013-07-15  Kwang Yul Seo  <skyul@company100.net>
 
         NetworkStorageSession::createDefaultSession is only implemented by Soup

diff --git a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp b/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp
@@ -107,7 +107,7 @@ void ChromeClientEfl::chromeDestroyed()
     delete this;
 }
 
-void ChromeClientEfl::focusedNodeChanged(Node*)
+void ChromeClientEfl::focusedElementChanged(Element*)
 {
     notImplemented();
 }

diff --git a/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h b/Source/WebKit/efl/WebCoreSupport/ChromeClientEfl.h
@@ -56,7 +56,7 @@ class ChromeClientEfl : public ChromeClient {
     virtual bool canTakeFocus(FocusDirection);
     virtual void takeFocus(FocusDirection);
 
-    virtual void focusedNodeChanged(Node*);
+    virtual void focusedElementChanged(Element*);
     virtual void focusedFrameChanged(Frame*);
 
     virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&);

diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2013-07-25  Andreas Kling  <akling@apple.com>
+
+        ChromeClient::focusedNodeChanged() should be focusedElementChanged().
+        <http://webkit.org/b/119110>
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::focusedElementChanged):
+        * WebCoreSupport/ChromeClientGtk.h:
+
 2013-07-23  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] GtkAdjustmentWatcher idle source not correctly handled

diff --git a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -343,7 +343,7 @@ void ChromeClient::takeFocus(FocusDirection)
     unfocus();
 }
 
-void ChromeClient::focusedNodeChanged(Node*)
+void ChromeClient::focusedElementChanged(Element*)
 {
 }
 

diff --git a/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h b/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h
@@ -58,7 +58,7 @@ namespace WebKit {
         virtual bool canTakeFocus(FocusDirection);
         virtual void takeFocus(FocusDirection);
 
-        virtual void focusedNodeChanged(Node*);
+        virtual void focusedElementChanged(Element*);
         virtual void focusedFrameChanged(Frame*);
 
         virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&);

diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2013-07-25  Andreas Kling  <akling@apple.com>
+
+        ChromeClient::focusedNodeChanged() should be focusedElementChanged().
+        <http://webkit.org/b/119110>
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/WebChromeClient.h:
+        * WebCoreSupport/WebChromeClient.mm:
+        (WebChromeClient::focusedElementChanged):
+
 2013-05-05  Geoffrey Garen  <ggaren@apple.com>
 
         Rolled back in r149527 with crash fixed.

diff --git a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h b/Source/WebKit/mac/WebCoreSupport/WebChromeClient.h
@@ -50,7 +50,7 @@ class WebChromeClient : public WebCore::ChromeClient {
     virtual bool canTakeFocus(WebCore::FocusDirection) OVERRIDE;
     virtual void takeFocus(WebCore::FocusDirection) OVERRIDE;
 
-    virtual void focusedNodeChanged(WebCore::Node*) OVERRIDE;
+    virtual void focusedElementChanged(WebCore::Element*) OVERRIDE;
     virtual void focusedFrameChanged(WebCore::Frame*) OVERRIDE;
 
     virtual WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&) OVERRIDE;

diff --git a/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm b/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
@@ -196,14 +196,14 @@ - (NSRect)_growBoxRect;
     }
 }
 
-void WebChromeClient::focusedNodeChanged(Node* node)
+void WebChromeClient::focusedElementChanged(Element* element)
 {
-    if (!node)
+    if (!element)
         return;
-    if (!isHTMLInputElement(node))
+    if (!isHTMLInputElement(element))
         return;
 
-    HTMLInputElement* inputElement = toHTMLInputElement(node);
+    HTMLInputElement* inputElement = toHTMLInputElement(element);
     if (!inputElement->isText())
         return;
 

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2013-07-25  Andreas Kling  <akling@apple.com>
+
+        ChromeClient::focusedNodeChanged() should be focusedElementChanged().
+        <http://webkit.org/b/119110>
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::focusedElementChanged):
+        * WebCoreSupport/ChromeClientQt.h:
+
 2013-07-23  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 
         Remove deprecated and unused compositing settings

diff --git a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -213,7 +213,7 @@ void ChromeClientQt::takeFocus(FocusDirection)
 }
 
 
-void ChromeClientQt::focusedNodeChanged(Node*)
+void ChromeClientQt::focusedElementChanged(Element*)
 {
 }
 

diff --git a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
@@ -77,7 +77,7 @@ class ChromeClientQt : public ChromeClient {
     virtual bool canTakeFocus(FocusDirection);
     virtual void takeFocus(FocusDirection);
 
-    virtual void focusedNodeChanged(Node*);
+    virtual void focusedElementChanged(Element*);
     virtual void focusedFrameChanged(Frame*);
 
     virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&);

diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2013-07-25  Andreas Kling  <akling@apple.com>
+
+        ChromeClient::focusedNodeChanged() should be focusedElementChanged().
+        <http://webkit.org/b/119110>
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/WebChromeClient.cpp:
+        (WebChromeClient::focusedElementChanged):
+        * WebCoreSupport/WebChromeClient.h:
+
 2013-07-23  peavo@outlook.com  <peavo@outlook.com>
 
         [Win] WebView didReceiveIcon delegate call doesn't have the icon in it

diff --git a/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
@@ -163,7 +163,7 @@ void WebChromeClient::takeFocus(FocusDirection direction)
     }
 }
 
-void WebChromeClient::focusedNodeChanged(Node*)
+void WebChromeClient::focusedElementChanged(Element*)
 {
 }
 

diff --git a/Source/WebKit/win/WebCoreSupport/WebChromeClient.h b/Source/WebKit/win/WebCoreSupport/WebChromeClient.h
@@ -54,7 +54,7 @@ class WebChromeClient : public WebCore::ChromeClient {
     virtual bool canTakeFocus(WebCore::FocusDirection);
     virtual void takeFocus(WebCore::FocusDirection);
 
-    virtual void focusedNodeChanged(WebCore::Node*);
+    virtual void focusedElementChanged(WebCore::Element*);
     virtual void focusedFrameChanged(WebCore::Frame*);
 
     virtual WebCore::Page* createWindow(WebCore::Frame*, const WebCore::FrameLoadRequest&, const WebCore::WindowFeatures&, const WebCore::NavigationAction&);

diff --git a/Source/WebKit/wince/ChangeLog b/Source/WebKit/wince/ChangeLog
@@ -1,3 +1,14 @@
+2013-07-25  Andreas Kling  <akling@apple.com>
+
+        ChromeClient::focusedNodeChanged() should be focusedElementChanged().
+        <http://webkit.org/b/119110>
+
+        Reviewed by Anders Carlsson.
+
+        * WebCoreSupport/ChromeClientWinCE.cpp:
+        (WebKit::ChromeClientWinCE::focusedElementChanged):
+        * WebCoreSupport/ChromeClientWinCE.h:
+
 2013-06-26  Patrick Gansterer  <paroga@webkit.org>
 
         Unreviewed WinCE build fix after r152065.

diff --git a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp b/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.cpp
@@ -165,7 +165,7 @@ void ChromeClientWinCE::takeFocus(FocusDirection)
     unfocus();
 }
 
-void ChromeClientWinCE::focusedNodeChanged(Node*)
+void ChromeClientWinCE::focusedElementChanged(Element*)
 {
     notImplemented();
 }

diff --git a/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h b/Source/WebKit/wince/WebCoreSupport/ChromeClientWinCE.h
@@ -48,7 +48,7 @@ class ChromeClientWinCE : public WebCore::ChromeClient {
     virtual bool canTakeFocus(WebCore::FocusDirection);
     virtual void takeFocus(WebCore::FocusDirection);
 
-    virtual void focusedNodeChanged(WebCore::Node*);
+    virtual void focusedElementChanged(WebCore::Element*);
     virtual void focusedFrameChanged(WebCore::Frame*);
 
     // The Frame pointer provides the ChromeClient with context about which

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2013-07-25  Andreas Kling  <akling@apple.com>
+
+        ChromeClient::focusedNodeChanged() should be focusedElementChanged().
+        <http://webkit.org/b/119110>
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::focusedElementChanged):
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+
 2013-07-25  Kwang Yul Seo  <skyul@company100.net>
 
         [WK2][Soup] Add private browsing support

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -160,18 +160,18 @@ void WebChromeClient::takeFocus(FocusDirection direction)
     m_page->send(Messages::WebPageProxy::TakeFocus(direction));
 }
 
-void WebChromeClient::focusedNodeChanged(Node* node)
+void WebChromeClient::focusedElementChanged(Element* element)
 {
-    if (!node)
+    if (!element)
         return;
-    if (!isHTMLInputElement(node))
+    if (!isHTMLInputElement(element))
         return;
 
-    HTMLInputElement* inputElement = toHTMLInputElement(node);
+    HTMLInputElement* inputElement = toHTMLInputElement(element);
     if (!inputElement->isText())
         return;
 
-    WebFrameLoaderClient* webFrameLoaderClient = toWebFrameLoaderClient(node->document()->frame()->loader()->client());
+    WebFrameLoaderClient* webFrameLoaderClient = toWebFrameLoaderClient(element->document()->frame()->loader()->client());
     WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : 0;
     ASSERT(webFrame);
     m_page->injectedBundleFormClient().didFocusTextField(m_page, inputElement, webFrame);

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h b/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
@@ -63,7 +63,7 @@ class WebChromeClient : public WebCore::ChromeClient {
     virtual bool canTakeFocus(WebCore::FocusDirection) OVERRIDE;
     virtual void takeFocus(WebCore::FocusDirection) OVERRIDE;
 
-    virtual void focusedNodeChanged(WebCore::Node*) OVERRIDE;
+    virtual void focusedElementChanged(WebCore::Element*) OVERRIDE;
     virtual void focusedFrameChanged(WebCore::Frame*) OVERRIDE;
 
     // The Frame pointer provides the ChromeClient with context about which