diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-06-03 17:53:38 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-06-08 14:50:08 +0100 |
| commit | 6f60177b50520b5406116adc50e752cb8a596243 (patch) | |
| tree | be05dc1f9ecf7c9d5d467f712aac74695178591b /WebKit | |
| parent | b98ea1c82f93c8ea37e69dbd7761f154c089d9a3 (diff) | |
| download | external_webkit-6f60177b50520b5406116adc50e752cb8a596243.zip external_webkit-6f60177b50520b5406116adc50e752cb8a596243.tar.gz external_webkit-6f60177b50520b5406116adc50e752cb8a596243.tar.bz2 | |
Merge webkit.org at r60469 : since @60104 the zoom level functions ar in the FrameView
http://trac.webkit.org/changeset/60104
Change-Id: I7050bd945d397552bd154490277881cb4cc961c9
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index 775eecf..7d89c60 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -261,8 +261,8 @@ public: #endif jobject textSize = env->GetObjectField(obj, gFieldIds->mTextSize); float zoomFactor = env->GetIntField(textSize, gFieldIds->mTextSizeValue) / 100.0f; - if (pFrame->zoomFactor() != zoomFactor) - pFrame->setZoomFactor(zoomFactor, WebCore::ZoomTextOnly); + if (pFrame->view()->zoomFactor() != zoomFactor) + pFrame->view()->setZoomFactor(zoomFactor, WebCore::ZoomTextOnly); jstring str = (jstring)env->GetObjectField(obj, gFieldIds->mStandardFontFamily); s->setStandardFontFamily(to_string(env, str)); |