From: Michael Kolb <kolby@google.com>
Date: Wed, 30 Nov 2011 23:54:31 +0000 (-0800)
Subject: add support for WebTextView on scrolling layers
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-webkit.git;a=commitdiff_plain;h=d635c32628b7d9760bf786613cbe3eddf98a1272

add support for WebTextView on scrolling layers

    Bug: 5677828

Change-Id: I22ecf16c79badab68d8305d2e040057d73b02bea
---

diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 2be01dc57..fd05ecb20 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -2096,6 +2096,15 @@ static int nativeFocusCandidateType(JNIEnv *env, jobject obj)
     return input->getType();
 }
 
+static int nativeFocusCandidateLayerId(JNIEnv *env, jobject obj)
+{
+    const CachedFrame* frame;
+    const CachedNode* node = getFocusNode(env, obj, &frame);
+    if (!node)
+        return -1;
+    return frame->layer(node)->uniqueId();
+}
+
 static bool nativeFocusIsPlugin(JNIEnv *env, jobject obj)
 {
     const CachedNode* node = getFocusNode(env, obj);
@@ -2791,6 +2800,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeFocusCandidateTextSize },
     { "nativeFocusCandidateType", "()I",
         (void*) nativeFocusCandidateType },
+    { "nativeFocusCandidateLayerId", "()I",
+        (void*) nativeFocusCandidateLayerId },
     { "nativeFocusIsPlugin", "()Z",
         (void*) nativeFocusIsPlugin },
     { "nativeFocusNodeBounds", "()Landroid/graphics/Rect;",