From 849e00858d5099fd739c7c717fbe9d933cf5a3e6 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 16 Jun 2011 17:07:05 -0700 Subject: Change mTextSize to be a percentage Change-Id: I22720665be2900121acaa3801adc36f3d7fddeae --- Source/WebKit/android/jni/WebSettings.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Source/WebKit/android/jni/WebSettings.cpp b/Source/WebKit/android/jni/WebSettings.cpp index 468e7b0..7ba5e96 100644 --- a/Source/WebKit/android/jni/WebSettings.cpp +++ b/Source/WebKit/android/jni/WebSettings.cpp @@ -67,8 +67,7 @@ struct FieldIds { FieldIds(JNIEnv* env, jclass clazz) { mLayoutAlgorithm = env->GetFieldID(clazz, "mLayoutAlgorithm", "Landroid/webkit/WebSettings$LayoutAlgorithm;"); - mTextSize = env->GetFieldID(clazz, "mTextSize", - "Landroid/webkit/WebSettings$TextSize;"); + mTextSize = env->GetFieldID(clazz, "mTextSize", "I"); mStandardFontFamily = env->GetFieldID(clazz, "mStandardFontFamily", "Ljava/lang/String;"); mFixedFontFamily = env->GetFieldID(clazz, "mFixedFontFamily", @@ -195,11 +194,6 @@ struct FieldIds { mOrdinal = env->GetMethodID(enumClass, "ordinal", "()I"); LOG_ASSERT(mOrdinal, "Could not find method ordinal"); env->DeleteLocalRef(enumClass); - - jclass textSizeClass = env->FindClass("android/webkit/WebSettings$TextSize"); - LOG_ASSERT(textSizeClass, "Could not find TextSize enum"); - mTextSizeValue = env->GetFieldID(textSizeClass, "value", "I"); - env->DeleteLocalRef(textSizeClass); } // Field ids @@ -347,8 +341,8 @@ public: } } #endif - jobject textSize = env->GetObjectField(obj, gFieldIds->mTextSize); - float zoomFactor = env->GetIntField(textSize, gFieldIds->mTextSizeValue) / 100.0f; + jint textSize = env->GetIntField(obj, gFieldIds->mTextSize); + float zoomFactor = textSize / 100.0f; if (pFrame->textZoomFactor() != zoomFactor) pFrame->setTextZoomFactor(zoomFactor); -- cgit v1.1