summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-10-11 15:33:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-11 15:33:34 -0700
commited563485f68022dd4d6000ae7256e763100a565f (patch)
tree7fa0888dd1bd677b19cee02fbd6c4593a48f40a9
parent6453761f63c04897066bb40bf7d9e0c8daac1a98 (diff)
parent85e3844824444f304a15e57f62d2e5670fb3bf47 (diff)
downloadexternal_webkit-ed563485f68022dd4d6000ae7256e763100a565f.zip
external_webkit-ed563485f68022dd4d6000ae7256e763100a565f.tar.gz
external_webkit-ed563485f68022dd4d6000ae7256e763100a565f.tar.bz2
am 85e38448: Support spellcheck attribute in input fields
* commit '85e3844824444f304a15e57f62d2e5670fb3bf47': Support spellcheck attribute in input fields
-rw-r--r--Source/WebKit/android/nav/CacheBuilder.cpp1
-rw-r--r--Source/WebKit/android/nav/CachedInput.h3
-rw-r--r--Source/WebKit/android/nav/WebView.cpp8
3 files changed, 12 insertions, 0 deletions
diff --git a/Source/WebKit/android/nav/CacheBuilder.cpp b/Source/WebKit/android/nav/CacheBuilder.cpp
index 3ec15f3..a4bc758 100644
--- a/Source/WebKit/android/nav/CacheBuilder.cpp
+++ b/Source/WebKit/android/nav/CacheBuilder.cpp
@@ -1246,6 +1246,7 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
type = TEXT_INPUT_CACHEDNODETYPE;
cachedInput.init();
cachedInput.setAutoComplete(input->autoComplete());
+ cachedInput.setSpellcheck(input->spellcheck());
cachedInput.setFormPointer(input->form());
cachedInput.setIsTextField(true);
exported = input->value().threadsafeCopy();
diff --git a/Source/WebKit/android/nav/CachedInput.h b/Source/WebKit/android/nav/CachedInput.h
index a3eabc7..77ae57b 100644
--- a/Source/WebKit/android/nav/CachedInput.h
+++ b/Source/WebKit/android/nav/CachedInput.h
@@ -78,7 +78,9 @@ public:
void setPaddingLeft(int left) { mPaddingLeft = left; }
void setPaddingRight(int right) { mPaddingRight = right; }
void setPaddingTop(int top) { mPaddingTop = top; }
+ void setSpellcheck(bool spellcheck) { mSpellcheck = spellcheck; }
void setTextSize(float textSize) { mTextSize = textSize; }
+ bool spellcheck() const { return mSpellcheck; }
float textSize() const { return mTextSize; }
private:
@@ -94,6 +96,7 @@ private:
float mTextSize;
Type mType;
bool mAutoComplete : 1;
+ bool mSpellcheck : 1;
bool mIsRtlText : 1;
bool mIsTextField : 1;
bool mIsTextArea : 1;
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 1dcc7c4..d062db3 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -2125,6 +2125,12 @@ static jint nativeFocusCandidatePointer(JNIEnv *env, jobject obj)
return reinterpret_cast<int>(node ? node->nodePointer() : 0);
}
+static jint nativeFocusCandidateIsSpellcheck(JNIEnv *env, jobject obj)
+{
+ const CachedInput* input = getInputCandidate(env, obj);
+ return input ? input->spellcheck() : false;
+}
+
static jobject nativeFocusCandidateText(JNIEnv *env, jobject obj)
{
const CachedNode* node = getFocusCandidate(env, obj, 0);
@@ -2835,6 +2841,8 @@ static JNINativeMethod gJavaWebViewMethods[] = {
(void*) nativeFocusCandidateMaxLength },
{ "nativeFocusCandidateIsAutoComplete", "()Z",
(void*) nativeFocusCandidateIsAutoComplete },
+ { "nativeFocusCandidateIsSpellcheck", "()Z",
+ (void*) nativeFocusCandidateIsSpellcheck },
{ "nativeFocusCandidateName", "()Ljava/lang/String;",
(void*) nativeFocusCandidateName },
{ "nativeFocusCandidateNodeBounds", "()Landroid/graphics/Rect;",