diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-12-07 18:32:05 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-07 18:32:05 -0800 |
| commit | 79b4ba1c1229e9fe893bc888545f23174a35ba04 (patch) | |
| tree | 385f654df52f89e7bdf875905c9da384a096c14c /WebKit/android/nav/CachedRoot.cpp | |
| parent | 34099fd7eeb1313b433230f5dd67254cf282890b (diff) | |
| parent | 3a360998e7aa91c194fa97a40131bf837f2bba1b (diff) | |
| download | external_webkit-79b4ba1c1229e9fe893bc888545f23174a35ba04.zip external_webkit-79b4ba1c1229e9fe893bc888545f23174a35ba04.tar.gz external_webkit-79b4ba1c1229e9fe893bc888545f23174a35ba04.tar.bz2 | |
am 3a360998: am dcbb033a: Store InputType information for <input> fields, return SEARCH action for SEARCH <input>
Merge commit '3a360998e7aa91c194fa97a40131bf837f2bba1b'
* commit '3a360998e7aa91c194fa97a40131bf837f2bba1b':
Store InputType information for <input> fields, return SEARCH action for SEARCH <input>
Diffstat (limited to 'WebKit/android/nav/CachedRoot.cpp')
| -rw-r--r-- | WebKit/android/nav/CachedRoot.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp index 83e2ab6..77fb5b8 100644 --- a/WebKit/android/nav/CachedRoot.cpp +++ b/WebKit/android/nav/CachedRoot.cpp @@ -26,7 +26,9 @@ #include "CachedPrefix.h" #include "android_graphics.h" #include "CachedHistory.h" +#include "CachedInput.h" #include "CachedNode.h" +#include "HTMLInputElement.h" #include "SkBitmap.h" #include "SkBounder.h" #include "SkCanvas.h" @@ -764,6 +766,10 @@ CachedRoot::ImeAction CachedRoot::cursorTextFieldAction() const // the cursor return FAILURE; } + const CachedInput* textInput = cursorFrame->textInput(cursor); + if (!textInput) return FAILURE; + if (textInput->inputType() == WebCore::HTMLInputElement::SEARCH) + return SEARCH; const CachedNode* firstTextfield = nextTextField(0, 0, false); if (!firstTextfield) { // Error case. There are no textfields in this tree. |