4 files changed, 28 insertions, 4 deletions
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index b98b31f..c5f7b12 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -1112,6 +1112,13 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
             type = PLUGIN_CACHEDNODETYPE;
             goto keepNode;
         }
+        // Only use the root contentEditable element
+        if (node->isContentEditable() && !node->parent()->isContentEditable()) {
+            bounds = absBounds;
+            takesFocus = true;
+            type = CONTENT_EDITABLE_CACHEDNODETYPE;
+            goto keepNode;
+        }
         if (nodeRenderer->isRenderBlock()) {
             RenderBlock* renderBlock = (RenderBlock*) nodeRenderer;
             if (renderBlock->hasColumns()) {
diff --git a/WebKit/android/nav/CachedNode.h b/WebKit/android/nav/CachedNode.h
index b707ac1..09f53c3 100644
--- a/WebKit/android/nav/CachedNode.h
+++ b/WebKit/android/nav/CachedNode.h
@@ -108,6 +108,7 @@ public:
     int index() const { return mIndex; }
     void init(WebCore::Node* node);
     bool isAnchor() const { return mType == ANCHOR_CACHEDNODETYPE; }
+    bool isContentEditable() const { return mType == CONTENT_EDITABLE_CACHEDNODETYPE; }
     bool isCursor() const { return mIsCursor; }
     bool isArea() const { return mType == AREA_CACHEDNODETYPE; }
     bool isFocus() const { return mIsFocus; }
@@ -174,7 +175,7 @@ public:
     const CachedNode* traverseNextNode() const { return mLast ? NULL : &this[1]; }
     bool useBounds() const { return mUseBounds; }
     bool useHitBounds() const { return mUseHitBounds; }
-    bool wantsKeyEvents() const { return isTextInput() || isPlugin(); }
+    bool wantsKeyEvents() const { return isTextInput() || isPlugin() || isContentEditable(); }
 private:
     friend class CacheBuilder;
     WebCore::String mExport;
diff --git a/WebKit/android/nav/CachedNodeType.h b/WebKit/android/nav/CachedNodeType.h
index 8334b2f..8bc9328 100644
--- a/WebKit/android/nav/CachedNodeType.h
+++ b/WebKit/android/nav/CachedNodeType.h
@@ -38,7 +38,8 @@ enum CachedNodeType {
     FRAME_CACHEDNODETYPE,
     PLUGIN_CACHEDNODETYPE,
     TEXT_INPUT_CACHEDNODETYPE,
-    SELECT_CACHEDNODETYPE
+    SELECT_CACHEDNODETYPE,
+    CONTENT_EDITABLE_CACHEDNODETYPE
 };
 
 enum CachedNodeBits {
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index d5c0758..fff0ea3 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -882,7 +882,7 @@ bool motionUp(int x, int y, int slop)
     viewInvalidate();
     if (!result->isTextInput()) {
         clearTextEntry();
-        if (!result->isSelect())
+        if (!result->isSelect() && !result->isContentEditable())
             setFollowedLink(true);
         if (syntheticLink)
             overrideUrlLoading(result->getExport());
@@ -1263,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);
@@ -1636,7 +1649,7 @@ static void nativeSetFindIsEmpty(JNIEnv *env, jobject obj)
 static void nativeSetFollowedLink(JNIEnv *env, jobject obj, bool followed)
 {
     const CachedNode* cursor = getCursorNode(env, obj);
-    if (cursor && !cursor->isSelect()) {
+    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);
@@ -1901,6 +1914,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeCreate },
     { "nativeCursorFramePointer", "()I",
         (void*) nativeCursorFramePointer },
+    { "nativePageShouldHandleShiftAndArrows", "()Z",
+        (void*) nativePageShouldHandleShiftAndArrows },
     { "nativeCursorMatchesFocus", "()Z",
         (void*) nativeCursorMatchesFocus },
     { "nativeCursorNodeBounds", "()Landroid/graphics/Rect;",