summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2010-11-16 11:10:55 -0800
committerTeng-Hui Zhu <ztenghui@google.com>2010-11-17 13:36:00 -0800
commit97349b6656c58e631c13b8552b077870a6a32eba (patch)
tree929513fda50bae5bd33dfb8d26286e5fd99968b2 /WebKit
parent02f88d26cf0763bd684a752045695aaf902844bc (diff)
downloadexternal_webkit-97349b6656c58e631c13b8552b077870a6a32eba.zip
external_webkit-97349b6656c58e631c13b8552b077870a6a32eba.tar.gz
external_webkit-97349b6656c58e631c13b8552b077870a6a32eba.tar.bz2
Merge Webkit at r71558: Add function focusedFrameChanged
http://trac.webkit.org/changeset/71541 Change-Id: Ic068c75dec986e8761c6d57030ce7cfba2e8eb01
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp1
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 8292fb2..f1e6279 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -141,6 +141,7 @@ bool ChromeClientAndroid::canTakeFocus(FocusDirection) { notImplemented(); retur
void ChromeClientAndroid::takeFocus(FocusDirection) { notImplemented(); }
void ChromeClientAndroid::focusedNodeChanged(Node*) { notImplemented(); }
+void ChromeClientAndroid::focusedFrameChanged(Frame*) { notImplemented(); }
Page* ChromeClientAndroid::createWindow(Frame* frame, const FrameLoadRequest&,
const WindowFeatures& features, const NavigationAction&)
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
index 18f6916..f6b26a4 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h
@@ -70,6 +70,7 @@ namespace android {
virtual void takeFocus(FocusDirection);
virtual void focusedNodeChanged(Node*);
+ virtual void focusedFrameChanged(Frame*);
// The Frame pointer provides the ChromeClient with context about which
// Frame wants to create the new Page. Also, the newly created window