1 files changed, 23 insertions, 4 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index bdcafbf..fff0ea3 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -882,7 +882,8 @@ bool motionUp(int x, int y, int slop)
     viewInvalidate();
     if (!result->isTextInput()) {
         clearTextEntry();
-        setFollowedLink(true);
+        if (!result->isSelect() && !result->isContentEditable())
+            setFollowedLink(true);
         if (syntheticLink)
             overrideUrlLoading(result->getExport());
     }
@@ -1262,6 +1263,19 @@ static const CachedInput* getInputCandidate(JNIEnv *env, jobject obj)
     return cursor ? frame->textInput(cursor) : 0;
 }
 
+static jboolean nativePageShouldHandleShiftAndArrows(JNIEnv *env, jobject obj)
+{
+    const CachedNode* focus = getFocusNode(env, obj);
+    if (!focus) return false;
+    // Plugins handle shift and arrows whether or not they have focus.
+    if (focus->isPlugin()) return true;
+    const CachedNode* cursor = getCursorNode(env, obj);
+    // ContentEditable nodes should only receive shift and arrows if they have
+    // both the cursor and the focus.
+    return cursor && cursor->nodePointer() == focus->nodePointer()
+            && cursor->isContentEditable();
+}
+
 static jboolean nativeCursorMatchesFocus(JNIEnv *env, jobject obj)
 {
     const CachedNode* cursor = getCursorNode(env, obj);
@@ -1634,9 +1648,12 @@ static void nativeSetFindIsEmpty(JNIEnv *env, jobject obj)
 
 static void nativeSetFollowedLink(JNIEnv *env, jobject obj, bool followed)
 {
-    WebView* view = GET_NATIVE_VIEW(env, obj);
-    LOG_ASSERT(view, "view not set in %s", __FUNCTION__);
-    view->setFollowedLink(followed);
+    const CachedNode* cursor = getCursorNode(env, obj);
+    if (cursor && !cursor->isSelect() && ! cursor->isContentEditable()) {
+        WebView* view = GET_NATIVE_VIEW(env, obj);
+        LOG_ASSERT(view, "view not set in %s", __FUNCTION__);
+        view->setFollowedLink(followed);
+    }
 }
 
 static void nativeSetHeightCanMeasure(JNIEnv *env, jobject obj, bool measure)
@@ -1897,6 +1914,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeCreate },
     { "nativeCursorFramePointer", "()I",
         (void*) nativeCursorFramePointer },
+    { "nativePageShouldHandleShiftAndArrows", "()Z",
+        (void*) nativePageShouldHandleShiftAndArrows },
     { "nativeCursorMatchesFocus", "()Z",
         (void*) nativeCursorMatchesFocus },
     { "nativeCursorNodeBounds", "()Landroid/graphics/Rect;",