cc: Move tiling management out of draw properties calculation.

cc/layers/picture_image_layer_impl_unittest.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/layers/picture_image_layer_impl.h"
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ skipping 41 matching lines @@
         break;
       case PENDING_TREE:
         tree = host_impl_.pending_tree();
         break;
       case NUM_TREES:
         NOTREACHED();
         break;
     }
     TestablePictureImageLayerImpl* layer =
         new TestablePictureImageLayerImpl(tree, id);
     layer->SetBounds(gfx::Size(100, 200));

[danakj, 2014/05/23 17:07:34]

can you SetContentBounds() here so you don't need to down below

     layer->tilings_.reset(new PictureLayerTilingSet(&tiling_client_,
                                                     layer->bounds()));
     layer->pile_ = tiling_client_.pile();
     return make_scoped_ptr(layer);
   }
 
   void UpdateDrawProperties() {
     host_impl_.pending_tree()->UpdateDrawProperties();
   }
 
+  void SetupDrawPropertiesAndUpdateTilePriorities(
+      TestablePictureImageLayerImpl* layer,
+      float ideal_contents_scale,
+      float device_scale_factor,
+      float page_scale_factor,
+      float maximum_animation_contents_scale,
+      bool animating_transform_to_screen) {
+    layer->draw_properties().ideal_contents_scale = 1.f;
+    layer->draw_properties().device_scale_factor = device_scale_factor;
+    layer->draw_properties().page_scale_factor = page_scale_factor;
+    layer->draw_properties().maximum_animation_contents_scale =
+        maximum_animation_contents_scale;
+    layer->draw_properties().screen_space_transform_is_animating =
+        animating_transform_to_screen;
+    layer->UpdateTilePriorities();
+  }
+
  protected:
   FakeImplProxy proxy_;
   FakeLayerTreeHostImpl host_impl_;
   TestSharedBitmapManager shared_bitmap_manager_;
   FakePictureLayerTilingClient tiling_client_;
 };
 
 TEST_F(PictureImageLayerImplTest, CalculateContentsScale) {
   scoped_ptr<TestablePictureImageLayerImpl> layer(CreateLayer(1, PENDING_TREE));
   layer->SetDrawsContent(true);
 
-  float contents_scale_x;
-  float contents_scale_y;
-  gfx::Size content_bounds;
-  layer->CalculateContentsScale(2.f,
-                                3.f,
-                                4.f,
-                                1.f,
-                                false,
-                                &contents_scale_x,
-                                &contents_scale_y,
-                                &content_bounds);
-  EXPECT_FLOAT_EQ(1.f, contents_scale_x);
-  EXPECT_FLOAT_EQ(1.f, contents_scale_y);
-  EXPECT_EQ(layer->bounds(), content_bounds);
+  SetupDrawPropertiesAndUpdateTilePriorities(
+      layer.get(), 2.f, 3.f, 4.f, 1.f, false);
+  EXPECT_FLOAT_EQ(1.f, layer->contents_scale_x());

[danakj, 2014/05/23 17:07:34]

Verify the MaxTilingContentScale() as well please

+  EXPECT_FLOAT_EQ(1.f, layer->contents_scale_y());
 }
 
 TEST_F(PictureImageLayerImplTest, AreVisibleResourcesReady) {
   scoped_ptr<TestablePictureImageLayerImpl> layer(CreateLayer(1, PENDING_TREE));
   layer->SetBounds(gfx::Size(100, 200));
   layer->SetDrawsContent(true);
 
   UpdateDrawProperties();
 
-  float contents_scale_x;
-  float contents_scale_y;
-  gfx::Size content_bounds;
-  layer->CalculateContentsScale(2.f,
-                                3.f,
-                                4.f,
-                                1.f,
-                                false,
-                                &contents_scale_x,
-                                &contents_scale_y,
-                                &content_bounds);
-  layer->UpdateTilePriorities();
+  SetupDrawPropertiesAndUpdateTilePriorities(
+      layer.get(), 2.f, 3.f, 4.f, 1.f, false);
 
   EXPECT_TRUE(layer->AreVisibleResourcesReady());
 }
 
 TEST_F(PictureImageLayerImplTest, IgnoreIdealContentScale) {
   scoped_ptr<TestablePictureImageLayerImpl> pending_layer(
       CreateLayer(1, PENDING_TREE));
   pending_layer->SetDrawsContent(true);
 
   // Set PictureLayerImpl::ideal_contents_scale_ to 2.f which is not equal
   // to the content scale used by PictureImageLayerImpl.
   const float suggested_ideal_contents_scale = 2.f;
   const float device_scale_factor = 3.f;
   const float page_scale_factor = 4.f;
   const float maximum_animation_contents_scale = 1.f;
   const bool animating_transform_to_screen = false;
-  float contents_scale_x;
-  float contents_scale_y;
-  gfx::Size content_bounds;
-  pending_layer->CalculateContentsScale(suggested_ideal_contents_scale,
-                                        device_scale_factor,
-                                        page_scale_factor,
-                                        maximum_animation_contents_scale,
-                                        animating_transform_to_screen,
-                                        &contents_scale_x,
-                                        &contents_scale_y,
-                                        &content_bounds);
+  SetupDrawPropertiesAndUpdateTilePriorities(pending_layer.get(),
+                                             suggested_ideal_contents_scale,
+                                             device_scale_factor,
+                                             page_scale_factor,
+                                             maximum_animation_contents_scale,
+                                             animating_transform_to_screen);
 
   // Push to active layer.
   host_impl_.ActivatePendingTree();
   scoped_ptr<TestablePictureImageLayerImpl> active_layer(
       CreateLayer(1, ACTIVE_TREE));
   pending_layer->PushPropertiesTo(active_layer.get());
-  active_layer->CalculateContentsScale(suggested_ideal_contents_scale,
-                                       device_scale_factor,
-                                       page_scale_factor,
-                                       maximum_animation_contents_scale,
-                                       animating_transform_to_screen,
-                                       &contents_scale_x,
-                                       &contents_scale_y,
-                                       &content_bounds);
+  SetupDrawPropertiesAndUpdateTilePriorities(active_layer.get(),
+                                             suggested_ideal_contents_scale,
+                                             device_scale_factor,
+                                             page_scale_factor,
+                                             maximum_animation_contents_scale,
+                                             animating_transform_to_screen);
 
   // Create tile and resource.
   active_layer->tilings()->tiling_at(0)->CreateAllTilesForTesting();
   host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(
       active_layer->tilings()->tiling_at(0)->AllTilesForTesting());
 
   // Draw.
+  active_layer->SetContentBounds(active_layer->bounds());
   active_layer->draw_properties().visible_content_rect =
       gfx::Rect(active_layer->bounds());
   MockQuadCuller quad_culler;
   AppendQuadsData data;
   active_layer->WillDraw(DRAW_MODE_SOFTWARE, NULL);
   active_layer->AppendQuads(&quad_culler, &data);
   active_layer->DidDraw(NULL);
 
   EXPECT_EQ(DrawQuad::TILED_CONTENT, quad_culler.quad_list()[0]->material);
 
   // Tiles are ready at correct scale, so should not set had_incomplete_tile.
   EXPECT_FALSE(data.had_incomplete_tile);
 }
 
 }  // namespace
 }  // namespace cc