am 74a4e2a1: am d5340bbd: Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.

Merge commit '74a4e2a1a7c59f4db044c2541919e05e7d04b2b5'

* commit '74a4e2a1a7c59f4db044c2541919e05e7d04b2b5':
  Merge webkit.org at r51976 : Implement new ChromeClient::focusedNodeChanged method.

2 files changed, 5 insertions, 1 deletions

diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index fa70670..8390cbc 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -104,6 +104,8 @@ void ChromeClientAndroid::unfocus() { notImplemented(); }
 bool ChromeClientAndroid::canTakeFocus(FocusDirection) { notImplemented(); return false; }
 void ChromeClientAndroid::takeFocus(FocusDirection) { notImplemented(); }
 
+void ChromeClientAndroid::focusedNodeChanged(Node*) { notImplemented(); }
+
 Page* ChromeClientAndroid::createWindow(Frame* frame, const FrameLoadRequest&,
         const WindowFeatures& features)
 {
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index 3129d1f..7396997 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -62,7 +62,9 @@ namespace android {
         
         virtual bool canTakeFocus(FocusDirection);
         virtual void takeFocus(FocusDirection);
-        
+
+        virtual void focusedNodeChanged(Node*);
+
         // The Frame pointer provides the ChromeClient with context about which
         // Frame wants to create the new Page.  Also, the newly created window
         // should not be shown to the user until the ChromeClient of the newly