Merge WebKit at r67908: FrameView zoom methods renamed and moved

See http://trac.webkit.org/changeset/67274 and
http://trac.webkit.org/changeset/67762

Change-Id: I3842c599327b564550a2f76ae4ae3628f70a7aff

2 files changed, 5 insertions, 5 deletions

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index fa96d40..997c421 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -905,11 +905,11 @@ void FrameLoaderClientAndroid::transitionToCommittedForNewPage() {
     IntRect visBounds = oldWebFrameView->getVisibleBounds();
     IntRect windowBounds = oldWebFrameView->getWindowBounds();
     WebCore::FrameView* oldFrameView = oldWebFrameView->view();
-    const float oldZoomFactor = oldFrameView->zoomFactor();
+    const float oldZoomFactor = oldFrameView->frame()->textZoomFactor();
     m_frame->createView(bounds.size(), oldFrameView->baseBackgroundColor(), oldFrameView->isTransparent(),
             oldFrameView->fixedLayoutSize(), oldFrameView->useFixedLayout());
-    if (oldZoomFactor != 1.0f && oldZoomFactor != m_frame->view()->zoomFactor()) {
-        m_frame->view()->setZoomFactor(oldZoomFactor, ZoomTextOnly);
+    if (oldZoomFactor != 1.0f && oldZoomFactor != m_frame->textZoomFactor()) {
+        m_frame->setTextZoomFactor(oldZoomFactor);
     }
 
     // Create a new WebFrameView for the new FrameView
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp
index ff6a482..6587b78 100644
--- a/WebKit/android/jni/WebSettings.cpp
+++ b/WebKit/android/jni/WebSettings.cpp
@@ -282,8 +282,8 @@ public:
 #endif
         jobject textSize = env->GetObjectField(obj, gFieldIds->mTextSize);
         float zoomFactor = env->GetIntField(textSize, gFieldIds->mTextSizeValue) / 100.0f;
-        if (pFrame->view()->zoomFactor() != zoomFactor)
-            pFrame->view()->setZoomFactor(zoomFactor, WebCore::ZoomTextOnly);
+        if (pFrame->textZoomFactor() != zoomFactor)
+            pFrame->setTextZoomFactor(zoomFactor);
 
         jstring str = (jstring)env->GetObjectField(obj, gFieldIds->mStandardFontFamily);
         s->setStandardFontFamily(to_string(env, str));