diff options
author | Bart Sears <bsears@google.com> | 2011-11-30 22:30:36 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 22:30:36 -0800 |
commit | 4cf706943f8eec4cbde974fbd590ec549d362eb8 (patch) | |
tree | 8f0f1885ad3761107f2548f949999649de55186d | |
parent | 89ed69e09b4358286964d79e14a3534523bedf03 (diff) | |
parent | 87f8fc15a0e59f6d88c57f390697ba1c5bbaa6c3 (diff) | |
download | external_webkit-4cf706943f8eec4cbde974fbd590ec549d362eb8.zip external_webkit-4cf706943f8eec4cbde974fbd590ec549d362eb8.tar.gz external_webkit-4cf706943f8eec4cbde974fbd590ec549d362eb8.tar.bz2 |
am 87f8fc15: Merge "add support for WebTextView on scrolling layers" into ics-mr1
* commit '87f8fc15a0e59f6d88c57f390697ba1c5bbaa6c3':
add support for WebTextView on scrolling layers
-rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 11 |
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;", |