cc: Remove separate x/y raster scales.

cc/trees/layer_tree_host_unittest_picture.cc

 // Copyright 2013 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/trees/layer_tree_host.h"
 
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/fake_picture_layer.h"
 #include "cc/test/fake_picture_layer_impl.h"
 #include "cc/test/layer_tree_test.h"
@@ skipping 440 matching lines @@
 
   void WillActivateTreeOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* gchild = impl->sync_tree()->LayerById(picture_->id());
     FakePictureLayerImpl* picture = static_cast<FakePictureLayerImpl*>(gchild);
     ready_to_draw_ = false;
 
     switch (frame_) {
       case 0:
         // On 1st commit the pending layer has tilings.
         ASSERT_EQ(1u, picture->tilings()->num_tilings());
-        EXPECT_EQ(1.f, picture->tilings()->tiling_at(0)->contents_scale_key());
+        EXPECT_EQ(1.f, picture->tilings()->tiling_at(0)->contents_scale());
         break;
       case 1:
         // On 2nd commit, the pending layer is transparent, so has a stale
         // value.
         ASSERT_EQ(1u, picture->tilings()->num_tilings());
-        EXPECT_EQ(1.f, picture->tilings()->tiling_at(0)->contents_scale_key());
+        EXPECT_EQ(1.f, picture->tilings()->tiling_at(0)->contents_scale());
         break;
       case 2:
         // On 3rd commit, the pending layer is visible again, so has tilings and
         // is updated for the pinch.
         ASSERT_EQ(1u, picture->tilings()->num_tilings());
-        EXPECT_EQ(2.f, picture->tilings()->tiling_at(0)->contents_scale_key());
+        EXPECT_EQ(2.f, picture->tilings()->tiling_at(0)->contents_scale());
     }
   }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* gchild = impl->active_tree()->LayerById(picture_->id());
     FakePictureLayerImpl* picture = static_cast<FakePictureLayerImpl*>(gchild);
 
     if (frame_ != last_frame_drawn_)
       draws_in_frame_ = 0;
     ++draws_in_frame_;
     last_frame_drawn_ = frame_;
 
     switch (frame_) {
       case 0:
         if (draws_in_frame_ == 1) {
           // On 1st commit the layer has tilings.
           EXPECT_GT(picture->tilings()->num_tilings(), 0u);
-          EXPECT_EQ(1.f, picture->HighResTiling()->contents_scale_key());
+          EXPECT_EQ(1.f, picture->HighResTiling()->contents_scale());
 
           // Pinch zoom in to change the scale on the active tree.
           impl->PinchGestureBegin();
           impl->PinchGestureUpdate(2.f, gfx::Point(1, 1));
           impl->PinchGestureEnd();
         } else if (picture->tilings()->num_tilings() == 1) {
           // If the pinch gesture caused a commit we could get here with a
           // pending tree.
           EXPECT_FALSE(impl->pending_tree());
-          EXPECT_EQ(2.f, picture->HighResTiling()->contents_scale_key());
+          EXPECT_EQ(2.f, picture->HighResTiling()->contents_scale());
 
           // Need to wait for ready to draw here so that the pinch is
           // entirely complete, otherwise another draw might come in before
           // the commit occurs.
           if (ready_to_draw_) {
             ++frame_;
             MainThreadTaskRunner()->PostTask(
                 FROM_HERE,
                 base::Bind(
                     &LayerTreeHostPictureTestRSLLMembershipWithScale::NextStep,
@@ skipping 97 matching lines @@
     FakePictureLayerImpl* will_change_layer =
         static_cast<FakePictureLayerImpl*>(
             impl->active_tree()->LayerById(will_change_layer_->id()));
     FakePictureLayerImpl* normal_layer = static_cast<FakePictureLayerImpl*>(
         impl->active_tree()->LayerById(normal_layer_->id()));
 
     switch (impl->sync_tree()->source_frame_number()) {
       case 0:
         // On first commit, both layers are at the default scale.
         ASSERT_EQ(1u, will_change_layer->tilings()->num_tilings());
-        EXPECT_EQ(
-            1.f,
-            will_change_layer->tilings()->tiling_at(0)->contents_scale_key());
+        EXPECT_EQ(1.f,
+                  will_change_layer->tilings()->tiling_at(0)->contents_scale());
         ASSERT_EQ(1u, normal_layer->tilings()->num_tilings());
-        EXPECT_EQ(1.f,
-                  normal_layer->tilings()->tiling_at(0)->contents_scale_key());
+        EXPECT_EQ(1.f, normal_layer->tilings()->tiling_at(0)->contents_scale());
 
         MainThreadTaskRunner()->PostTask(
             FROM_HERE,
             base::Bind(
                 &LayerTreeHostPictureTestForceRecalculateScales::ScaleRootUp,
                 base::Unretained(this)));
         break;
       case 1:
         // On 2nd commit after scaling up to 2, the normal layer will adjust its
         // scale and the will change layer should not (as it is will change.
         ASSERT_EQ(1u, will_change_layer->tilings()->num_tilings());
-        EXPECT_EQ(
-            1.f,
-            will_change_layer->tilings()->tiling_at(0)->contents_scale_key());
+        EXPECT_EQ(1.f,
+                  will_change_layer->tilings()->tiling_at(0)->contents_scale());
         ASSERT_EQ(1u, normal_layer->tilings()->num_tilings());
-        EXPECT_EQ(2.f,
-                  normal_layer->tilings()->tiling_at(0)->contents_scale_key());
+        EXPECT_EQ(2.f, normal_layer->tilings()->tiling_at(0)->contents_scale());
 
         MainThreadTaskRunner()->PostTask(
             FROM_HERE,
             base::Bind(&LayerTreeHostPictureTestForceRecalculateScales::
                            ScaleRootUpAndRecalculateScales,
                        base::Unretained(this)));
         break;
       case 2:
         // On 3rd commit, both layers should adjust scales due to forced
         // recalculating.
         ASSERT_EQ(1u, will_change_layer->tilings()->num_tilings());
-        EXPECT_EQ(
-            4.f,
-            will_change_layer->tilings()->tiling_at(0)->contents_scale_key());
+        EXPECT_EQ(4.f,
+                  will_change_layer->tilings()->tiling_at(0)->contents_scale());
         ASSERT_EQ(1u, normal_layer->tilings()->num_tilings());
-        EXPECT_EQ(4.f,
-                  normal_layer->tilings()->tiling_at(0)->contents_scale_key());
+        EXPECT_EQ(4.f, normal_layer->tilings()->tiling_at(0)->contents_scale());
         EndTest();
         break;
     }
   }
 
   void ScaleRootUp() {
     gfx::Transform transform;
     transform.Scale(2, 2);
     layer_tree_host()->GetLayerTree()->root_layer()->SetTransform(transform);
   }
 
   void ScaleRootUpAndRecalculateScales() {
     gfx::Transform transform;
     transform.Scale(4, 4);
     layer_tree_host()->GetLayerTree()->root_layer()->SetTransform(transform);
     layer_tree_host()->SetNeedsRecalculateRasterScales();
   }
 
   void AfterTest() override {}
 
   scoped_refptr<FakePictureLayer> will_change_layer_;
   scoped_refptr<FakePictureLayer> normal_layer_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostPictureTestForceRecalculateScales);
 
 }  // namespace
 }  // namespace cc