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

Source/core/page/Page.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 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,
@@ skipping 97 matching lines @@
     virtual ~Page();
 
     void makeOrdinary();
 
     // This method returns all pages, incl. private ones associated with
     // inspector overlay, popups, SVGImage, etc.
     static HashSet<Page*>& allPages();
     // This method returns all ordinary pages.
     static HashSet<Page*>& ordinaryPages();
 
-    FrameHost& frameHost() { return *m_frameHost; }
+    FrameHost& frameHost() const { return *m_frameHost; }
 
     void setNeedsRecalcStyleInAllFrames();
     void updateAcceleratedCompositingSettings();
 
     ViewportDescription viewportDescription() const;
 
     static void refreshPlugins(bool reload);
     PluginData* pluginData() const;
 
     EditorClient& editorClient() const { return *m_editorClient; }
@@ skipping 41 matching lines @@
 
     void unmarkAllTextMatches();
 
     // DefersLoading is used to delay loads during modal dialogs.
     // Modal dialogs are supposed to freeze all background processes
     // in the page, including prevent additional loads from staring/continuing.
     void setDefersLoading(bool);
     bool defersLoading() const { return m_defersLoading; }
 
     void setPageScaleFactor(float scale, const IntPoint& origin);
-    float pageScaleFactor() const { return m_pageScaleFactor; }
+    float pageScaleFactor() const;
 
     float deviceScaleFactor() const { return m_deviceScaleFactor; }
     void setDeviceScaleFactor(float);
 
     static void allVisitedStateChanged();
     static void visitedStateChanged(LinkHash visitedHash);
 
     StorageNamespace* sessionStorage(bool optionalCreate = true);
     StorageClient& storageClient() const { return *m_storageClient; }
 
@@ skipping 77 matching lines @@
     OwnPtr<ValidationMessageClient> m_validationMessageClient;
 
     UseCounter m_useCounter;
 
     int m_subframeCount;
     bool m_openedByDOM;
 
     bool m_tabKeyCyclesThroughElements;
     bool m_defersLoading;
 
-    float m_pageScaleFactor;
     float m_deviceScaleFactor;
 
     OwnPtr<StorageNamespace> m_sessionStorage;
 
     double m_timerAlignmentInterval;
 
     PageVisibilityState m_visibilityState;
 
     bool m_isCursorVisible;
 
 #ifndef NDEBUG
     bool m_isPainting;
 #endif
 
     HashSet<MultisamplingChangedObserver*> m_multisamplingChangedObservers;
 
     // A pointer to all the interfaces provided to in-process Frames for this Page.
     // FIXME: Most of the members of Page should move onto FrameHost.
     OwnPtr<FrameHost> m_frameHost;
 };
 
 } // namespace WebCore
 
 #endif // Page_h