diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-11-12 14:39:06 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-11-12 15:03:29 -0500 |
| commit | 3a3b28707d2d6a06afe9f3137e9bedc07246d600 (patch) | |
| tree | 941ecc05653298bf10a5cedaa0960000494823d2 /WebKit/android/nav/WebView.cpp | |
| parent | 1833a7fa5cd5a19afd4cba9cfc4e103e44ded8eb (diff) | |
| download | external_webkit-3a3b28707d2d6a06afe9f3137e9bedc07246d600.zip external_webkit-3a3b28707d2d6a06afe9f3137e9bedc07246d600.tar.gz external_webkit-3a3b28707d2d6a06afe9f3137e9bedc07246d600.tar.bz2 | |
Return a float for text size.
Bug:3085564
Requires a change in frameworks/base: https://android-git.corp.google.com/g/#change,79591
Change-Id: Iaf3ebc405fca349e23bebb113228c4b550e6b88e
Diffstat (limited to 'WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 9579509..ef68bf5 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -1718,10 +1718,10 @@ static jobject nativeFocusCandidateText(JNIEnv *env, jobject obj) return WtfStringToJstring(env, value); } -static jint nativeFocusCandidateTextSize(JNIEnv *env, jobject obj) +static jfloat nativeFocusCandidateTextSize(JNIEnv *env, jobject obj) { const CachedInput* input = getInputCandidate(env, obj); - return input ? input->textSize() : 0; + return input ? input->textSize() : 0.f; } static int nativeFocusCandidateType(JNIEnv *env, jobject obj) @@ -2281,7 +2281,7 @@ static JNINativeMethod gJavaWebViewMethods[] = { (void*) nativeFocusCandidatePointer }, { "nativeFocusCandidateText", "()Ljava/lang/String;", (void*) nativeFocusCandidateText }, - { "nativeFocusCandidateTextSize", "()I", + { "nativeFocusCandidateTextSize", "()F", (void*) nativeFocusCandidateTextSize }, { "nativeFocusCandidateType", "()I", (void*) nativeFocusCandidateType }, |