Chromium compositor change implementing page-scale driven pinch-zoom.

cc/CCLayerTreeHostTest.cpp

Index: cc/CCLayerTreeHostTest.cpp
===================================================================
--- cc/CCLayerTreeHostTest.cpp	(revision 157978)
+++ cc/CCLayerTreeHostTest.cpp	(working copy)
@@ -1049,7 +1049,7 @@
     {
         EXPECT_EQ(IntSize(20, 20), impl->layoutViewportSize());
         EXPECT_EQ(SK_ColorGRAY, impl->backgroundColor());
-        EXPECT_EQ(5, impl->pageScale());
+        EXPECT_EQ(5, impl->pageScaleFactor());
 
         endTest();
     }
@@ -1088,7 +1088,7 @@
     {
         impl->rootLayer()->setScrollable(true);
         impl->rootLayer()->setScrollPosition(IntPoint());
-        impl->setPageScaleFactorAndLimits(impl->pageScale(), 0.5, 2);
+        impl->setPageScaleFactorAndLimits(impl->pageScaleFactor(), 0.5, 2);
 
         // We request animation only once.
         if (!m_animationRequested) {
@@ -1109,7 +1109,7 @@
         impl->processScrollDeltas();
         // We get one commit before the first draw, and the animation doesn't happen until the second draw.
         if (impl->sourceFrameNumber() == 1) {
-            EXPECT_EQ(1.25, impl->pageScale());
+            EXPECT_EQ(1.25, impl->pageScaleFactor());
             endTest();
         } else
             postSetNeedsRedrawToMainThread();