In WebTextView, check the focus before sending a key.

This fixes a bug where the DOM has moved the focus, but the WebTextView
is still sending keys to the old focus.  Requires a change in
frameworks/base.  This part of the change just gives WebView a way
to get a pointer to the currently focused node (regardless of the
cursor).

1 files changed, 8 insertions, 0 deletions

diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 56570a6..78b7c72 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -1645,6 +1645,12 @@ static jint nativeFocusCandidateTextSize(JNIEnv *env, jobject obj)
     return node ? node->textSize() : 0;
 }
 
+static jint nativeFocusNodePointer(JNIEnv *env, jobject obj)
+{
+    const CachedNode* node = getFocusNode(env, obj);
+    return node ? reinterpret_cast<int>(node->nodePointer()) : 0;
+}
+
 static bool nativeCursorWantsKeyEvents(JNIEnv* env, jobject jwebview) {
     WebView* view = GET_NATIVE_VIEW(env, jwebview);
     LOG_ASSERT(view, "view not set in %s", __FUNCTION__);
@@ -1977,6 +1983,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeFocusCandidateText },
     { "nativeFocusCandidateTextSize", "()I",
         (void*) nativeFocusCandidateTextSize },
+    { "nativeFocusNodePointer", "()I",
+        (void*) nativeFocusNodePointer },
     { "nativeGetCursorRingBounds", "()Landroid/graphics/Rect;",
         (void*) nativeGetCursorRingBounds },
     { "nativeGetSelection", "()Landroid/graphics/Region;",