am 4843cf01: am 9fb6b3c3: Ensure that the current textfield is actually a textfield before treating it like one.

Merge commit '4843cf010e538098e485802576b5a16d7f5cb5f1'

* commit '4843cf010e538098e485802576b5a16d7f5cb5f1':
  Ensure that the current textfield is actually a textfield before treating it like one.

1 files changed, 2 insertions, 2 deletions

diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp
index e783eae..d9669bd 100644
--- a/WebKit/android/nav/CachedRoot.cpp
+++ b/WebKit/android/nav/CachedRoot.cpp
@@ -760,11 +760,11 @@ CachedRoot::ImeAction CachedRoot::currentTextFieldAction() const
 {
     const CachedFrame* currentFrame;
     const CachedNode* current = currentCursor(&currentFrame);
-    if (!current) {
+    if (!current || !current->isTextInput()) {
         // Although the cursor is not on a textfield, a textfield may have
         // focus.  Find the action for that textfield.
         current = currentFocus(&currentFrame);
-        if (!current)
+        if (!current || !current->isTextInput())
             // Error case.  No cursor and no focus.
             return FAILURE;
     }