summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-11-30 15:54:31 -0800
committerMichael Kolb <kolby@google.com>2011-11-30 15:54:31 -0800
commitd635c32628b7d9760bf786613cbe3eddf98a1272 (patch)
tree81d4a4af79bc738acd19fb2175441823ca7fb5bd
parente1ea7f8384757f9b46805df75a0aa72c1fc041b7 (diff)
downloadexternal_webkit-d635c32628b7d9760bf786613cbe3eddf98a1272.zip
external_webkit-d635c32628b7d9760bf786613cbe3eddf98a1272.tar.gz
external_webkit-d635c32628b7d9760bf786613cbe3eddf98a1272.tar.bz2
add support for WebTextView on scrolling layers
Bug: 5677828 Change-Id: I22ecf16c79badab68d8305d2e040057d73b02bea
-rw-r--r--Source/WebKit/android/nav/WebView.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 2be01dc..fd05ecb 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;",