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

cc/CCLayerTreeHostTest.cpp

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCLayerTreeHost.h"
 
 #include "CCGeometryTestUtils.h"
 #include "CCGraphicsContext.h"
@@ skipping 1031 matching lines @@
         m_layerTreeHost->setBackgroundColor(SK_ColorGRAY);
         m_layerTreeHost->setPageScaleFactorAndLimits(5, 5, 5);
 
         postSetNeedsCommitToMainThread();
     }
 
     virtual void commitCompleteOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
     {
         EXPECT_EQ(IntSize(20, 20), impl->layoutViewportSize());
         EXPECT_EQ(SK_ColorGRAY, impl->backgroundColor());
-        EXPECT_EQ(5, impl->pageScale());
+        EXPECT_EQ(5, impl->pageScaleFactor());
 
         endTest();
     }
 
     virtual void afterTest() OVERRIDE { }
 };
 
 TEST_F(CCLayerTreeHostTestCommit, runTest)
 {
     runTest(true);
@@ skipping 18 matching lines @@
 
     void requestStartPageScaleAnimation()
     {
         layerTreeHost()->startPageScaleAnimation(IntSize(), false, 1.25, 0);
     }
 
     virtual void drawLayersOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
     {
         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) {
             m_mainThreadProxy->postTask(createCCThreadTask(this, &CCLayerTreeHostTestStartPageScaleAnimation::requestStartPageScaleAnimation));
             m_animationRequested = true;
         }
     }
 
     virtual void applyScrollAndScale(const IntSize& scrollDelta, float scale) OVERRIDE
     {
         IntPoint position = m_layerTreeHost->rootLayer()->scrollPosition();
         m_layerTreeHost->rootLayer()->setScrollPosition(position + scrollDelta);
         m_layerTreeHost->setPageScaleFactorAndLimits(scale, 0.5, 2);
     }
 
     virtual void commitCompleteOnCCThread(CCLayerTreeHostImpl* impl) OVERRIDE
     {
         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();
     }
 
     virtual void afterTest() OVERRIDE
     {
     }
 
 private:
@@ skipping 1865 matching lines @@
     int m_numCommitComplete;
     int m_numDrawLayers;
 };
 
 TEST_F(CCLayerTreeHostTestContinuousAnimate, runMultiThread)
 {
     runTest(true);
 }
 
 } // namespace