Move page scale ownership to LayerTreeImpl.

cc/layer_tree_host_unittest.cc

 // 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 "cc/layer_tree_host.h"
 
 #include "base/synchronization/lock.h"
 #include "cc/content_layer.h"
 #include "cc/content_layer_client.h"
 #include "cc/frame_rate_controller.h"
@@ skipping 630 matching lines @@
         m_layerTreeHost->setBackgroundColor(SK_ColorGRAY);
         m_layerTreeHost->setPageScaleFactorAndLimits(5, 5, 5);
 
         postSetNeedsCommitToMainThread();
     }
 
     virtual void commitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE
     {
         EXPECT_EQ(gfx::Size(20, 20), impl->layoutViewportSize());
         EXPECT_EQ(SK_ColorGRAY, impl->activeTree()->background_color());
-        EXPECT_EQ(5, impl->pageScaleFactor());
+        EXPECT_EQ(5, impl->activeTree()->page_scale_factor());
 
         endTest();
     }
 
     virtual void afterTest() OVERRIDE { }
 };
 
 TEST_F(LayerTreeHostTestCommit, runTest)
 {
     runTest(true);
@@ skipping 19 matching lines @@
 
     void requestStartPageScaleAnimation()
     {
         layerTreeHost()->startPageScaleAnimation(gfx::Vector2d(), false, 1.25, base::TimeDelta());
     }
 
     virtual void drawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE
     {
         impl->rootLayer()->setScrollable(true);
         impl->rootLayer()->setScrollOffset(gfx::Vector2d());
-        impl->setPageScaleFactorAndLimits(impl->pageScaleFactor(), 0.5, 2);
+        impl->activeTree()->SetPageScaleFactorAndLimits(impl->activeTree()->page_scale_factor(), 0.5, 2);
 
         // We request animation only once.
         if (!m_animationRequested) {
             impl->proxy()->mainThread()->postTask(base::Bind(&LayerTreeHostTestStartPageScaleAnimation::requestStartPageScaleAnimation, base::Unretained(this)));
             m_animationRequested = true;
         }
     }
 
     virtual void applyScrollAndScale(gfx::Vector2d scrollDelta, float scale) OVERRIDE
     {
         gfx::Vector2d offset = m_layerTreeHost->rootLayer()->scrollOffset();
         m_layerTreeHost->rootLayer()->setScrollOffset(offset + scrollDelta);
         m_layerTreeHost->setPageScaleFactorAndLimits(scale, 0.5, 2);
     }
 
     virtual void commitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE
     {
         impl->processScrollDeltas();
         // We get one commit before the first draw, and the animation doesn't happen until the second draw.
         if (impl->activeTree()->source_frame_number() == 1) {
-            EXPECT_EQ(1.25, impl->pageScaleFactor());
+            EXPECT_EQ(1.25, impl->activeTree()->page_scale_factor());
             endTest();
         } else
             postSetNeedsRedrawToMainThread();
     }
 
     virtual void afterTest() OVERRIDE
     {
     }
 
 private:
@@ skipping 1373 matching lines @@
 }
 
 TEST_F(LayerTreeHostTestMaxPendingFrames, GLRenderer)
 {
     m_delegatingRenderer = false;
     runTest(true);
 }
 
 }  // namespace
 }  // namespace cc