[Pinch-to-zoom] Moved scale factor into PinchViewport

Source/core/page/Page.cpp

Index: Source/core/page/Page.cpp
diff --git a/Source/core/page/Page.cpp b/Source/core/page/Page.cpp
index 9b8c3e0e10175163061adf360f0365640b64f8eb..2418d536f668429d5a6993da40efe157edd442ce 100644
--- a/Source/core/page/Page.cpp
+++ b/Source/core/page/Page.cpp
@@ -127,7 +127,6 @@ Page::Page(PageClients& pageClients)
     , m_openedByDOM(false)
     , m_tabKeyCyclesThroughElements(true)
     , m_defersLoading(false)
-    , m_pageScaleFactor(1)
     , m_deviceScaleFactor(1)
     , m_timerAlignmentInterval(DOMTimer::visiblePageAlignmentInterval())
     , m_visibilityState(PageVisibilityStateVisible)
@@ -337,9 +336,10 @@ void Page::setDefersLoading(bool defers)
 void Page::setPageScaleFactor(float scale, const IntPoint& origin)
 {
     FrameView* view = mainFrame()->view();
+    PinchViewport& viewport = frameHost().pinchViewport();
 
-    if (scale != m_pageScaleFactor) {
-        m_pageScaleFactor = scale;
+    if (scale != viewport.scale()) {
+        viewport.setScale(scale);
 
         if (view)
             view->setVisibleContentScaleFactor(scale);
@@ -357,6 +357,11 @@ void Page::setPageScaleFactor(float scale, const IntPoint& origin)
         view->notifyScrollPositionChanged(origin);
 }
 
+float Page::pageScaleFactor() const
+{
+    return frameHost().pinchViewport().scale();
+}
+
 void Page::setDeviceScaleFactor(float scaleFactor)
 {
     if (m_deviceScaleFactor == scaleFactor)