am 87f8fc15: Merge "add support for WebTextView on scrolling layers" into ics-mr1

* commit '87f8fc15a0e59f6d88c57f390697ba1c5bbaa6c3':
  add support for WebTextView on scrolling layers

1 files changed, 11 insertions, 0 deletions

diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 544e284..0e4414e 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -2093,6 +2093,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);
@@ -2781,6 +2790,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeFocusCandidateTextSize },
     { "nativeFocusCandidateType", "()I",
         (void*) nativeFocusCandidateType },
+    { "nativeFocusCandidateLayerId", "()I",
+        (void*) nativeFocusCandidateLayerId },
     { "nativeFocusIsPlugin", "()Z",
         (void*) nativeFocusIsPlugin },
     { "nativeFocusNodeBounds", "()Landroid/graphics/Rect;",