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

Source/core/page/Page.h

Index: Source/core/page/Page.h
diff --git a/Source/core/page/Page.h b/Source/core/page/Page.h
index 61d61e2b073c129d2bc85eb43e05376d54fc77c6..c6f01b7a3f355f074470fc32a97dc0c250def3f3 100644
--- a/Source/core/page/Page.h
+++ b/Source/core/page/Page.h
@@ -115,7 +115,7 @@ public:
     // This method returns all ordinary pages.
     static HashSet<Page*>& ordinaryPages();
 
-    FrameHost& frameHost() { return *m_frameHost; }
+    FrameHost& frameHost() const { return *m_frameHost; }
 
     void setNeedsRecalcStyleInAllFrames();
 
@@ -176,7 +176,7 @@ public:
     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);
@@ -270,7 +270,6 @@ private:
     bool m_tabKeyCyclesThroughElements;
     bool m_defersLoading;
 
-    float m_pageScaleFactor;
     float m_deviceScaleFactor;
 
     OwnPtr<StorageNamespace> m_sessionStorage;