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

Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 109 matching lines @@
     , m_historyController(adoptPtr(new HistoryController(this)))
     , m_undoStack(UndoStack::create())
     , m_backForwardClient(pageClients.backForwardClient)
     , m_editorClient(pageClients.editorClient)
     , m_spellCheckerClient(pageClients.spellCheckerClient)
     , m_storageClient(pageClients.storageClient)
     , m_subframeCount(0)
     , m_openedByDOM(false)
     , m_tabKeyCyclesThroughElements(true)
     , m_defersLoading(false)
-    , m_pageScaleFactor(1)
     , m_deviceScaleFactor(1)
     , m_timerAlignmentInterval(DOMTimer::visiblePageAlignmentInterval())
     , m_visibilityState(PageVisibilityStateVisible)
     , m_isCursorVisible(true)
 #ifndef NDEBUG
     , m_isPainting(false)
 #endif
     , m_frameHost(FrameHost::create(*this))
 {
     ASSERT(m_editorClient);
@@ skipping 170 matching lines @@
         return;
 
     m_defersLoading = defers;
     for (LocalFrame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->loader().setDefersLoading(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);
 
         mainFrame()->deviceOrPageScaleFactorChanged();
         m_chrome->client().deviceOrPageScaleFactorChanged();
 
         if (view)
             view->viewportConstrainedVisibleContentSizeChanged(true, true);
 
         mainFrame()->loader().saveScrollState();
     }
 
     if (view && view->scrollPosition() != origin)
         view->notifyScrollPositionChanged(origin);
 }
 
+float Page::pageScaleFactor() const
+{
+    return frameHost().pinchViewport().scale();
+}
+
 void Page::setDeviceScaleFactor(float scaleFactor)
 {
     if (m_deviceScaleFactor == scaleFactor)
         return;
 
     m_deviceScaleFactor = scaleFactor;
     setNeedsRecalcStyleInAllFrames();
 
     if (mainFrame()) {
         mainFrame()->deviceOrPageScaleFactorChanged();
@@ skipping 222 matching lines @@
     , spellCheckerClient(0)
     , storageClient(0)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 } // namespace WebCore