cc: Refactor how picture layers are exposed to the tile manager.

cc/layers/picture_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_layer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <utility>
@@ skipping 280 matching lines @@
 
   EXPECT_EQ(pending_layer_->tilings()->num_tilings(),
             active_layer_->tilings()->num_tilings());
 
   const PictureLayerTilingSet* tilings = pending_layer_->tilings();
   EXPECT_GT(tilings->num_tilings(), 0u);
   for (size_t i = 0; i < tilings->num_tilings(); ++i)
     VerifyAllTilesExistAndHavePile(tilings->tiling_at(i), active_pile.get());
 }
 
-TEST_F(PictureLayerImplTest, TileManagerRegisterUnregister) {
-  gfx::Size tile_size(100, 100);
-  gfx::Size layer_bounds(400, 400);
-
-  scoped_refptr<FakePicturePileImpl> pending_pile =
-      FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
-  scoped_refptr<FakePicturePileImpl> active_pile =
-      FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
-
-  SetupTrees(pending_pile, active_pile);
-
-  std::vector<TileManager::PairedPictureLayer> paired_layers;
-  host_impl_.tile_manager()->GetPairedPictureLayers(&paired_layers);
-  EXPECT_EQ(0u, paired_layers.size());
-
-  // Update tile priorities will force the layer to register itself.
-  float dummy_contents_scale_x;
-  float dummy_contents_scale_y;
-  gfx::Size dummy_content_bounds;
-  active_layer_->CalculateContentsScale(1.f,
-                                        1.f,
-                                        1.f,
-                                        1.f,
-                                        false,
-                                        &dummy_contents_scale_x,
-                                        &dummy_contents_scale_y,
-                                        &dummy_content_bounds);
-  active_layer_->UpdateTilePriorities();
-  host_impl_.pending_tree()->UpdateDrawProperties();
-  pending_layer_->CalculateContentsScale(1.f,
-                                         1.f,
-                                         1.f,
-                                         1.f,
-                                         false,
-                                         &dummy_contents_scale_x,
-                                         &dummy_contents_scale_y,
-                                         &dummy_content_bounds);
-  pending_layer_->UpdateTilePriorities();
-
-  host_impl_.tile_manager()->GetPairedPictureLayers(&paired_layers);
-  EXPECT_EQ(1u, paired_layers.size());
-  EXPECT_EQ(active_layer_, paired_layers[0].active_layer);
-  EXPECT_EQ(pending_layer_, paired_layers[0].pending_layer);
-
-  // Destroy and recreate tile manager.
-  host_impl_.DidLoseOutputSurface();
-  scoped_ptr<TestWebGraphicsContext3D> context =
-      TestWebGraphicsContext3D::Create();
-  host_impl_.InitializeRenderer(
-      FakeOutputSurface::Create3d(context.Pass()).PassAs<OutputSurface>());
-
-  host_impl_.tile_manager()->GetPairedPictureLayers(&paired_layers);
-  EXPECT_EQ(0u, paired_layers.size());
-
-  active_layer_->CalculateContentsScale(1.f,
-                                        1.f,
-                                        1.f,
-                                        1.f,
-                                        false,
-                                        &dummy_contents_scale_x,
-                                        &dummy_contents_scale_y,
-                                        &dummy_content_bounds);
-  active_layer_->UpdateTilePriorities();
-  host_impl_.pending_tree()->UpdateDrawProperties();
-  pending_layer_->CalculateContentsScale(1.f,
-                                         1.f,
-                                         1.f,
-                                         1.f,
-                                         false,
-                                         &dummy_contents_scale_x,
-                                         &dummy_contents_scale_y,
-                                         &dummy_content_bounds);
-  pending_layer_->UpdateTilePriorities();
-
-  host_impl_.tile_manager()->GetPairedPictureLayers(&paired_layers);
-  EXPECT_EQ(1u, paired_layers.size());
-  EXPECT_EQ(active_layer_, paired_layers[0].active_layer);
-  EXPECT_EQ(pending_layer_, paired_layers[0].pending_layer);
-}
-
 TEST_F(PictureLayerImplTest, InvalidViewportForPrioritizingTiles) {
   base::TimeTicks time_ticks;
   host_impl_.SetCurrentFrameTimeTicks(time_ticks);
 
   gfx::Size tile_size(100, 100);
   gfx::Size layer_bounds(400, 400);
 
   scoped_refptr<FakePicturePileImpl> pending_pile =
       FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
   scoped_refptr<FakePicturePileImpl> active_pile =
@@ skipping 2203 matching lines @@
   EXPECT_EQ(active_layer_->HighResTiling()->AllTilesForTesting().size(), 0u);
 
   // Since the active layer has no tiles at all, the pending layer doesn't
   // need content in order to activate.
   pending_layer_->MarkVisibleResourcesAsRequired();
   AssertNoTilesRequired(pending_layer_->HighResTiling());
   if (host_impl_.settings().create_low_res_tiling)
     AssertNoTilesRequired(pending_layer_->LowResTiling());
 }
 
-TEST_F(NoLowResPictureLayerImplTest, TileManagerRegisterUnregister) {
-  gfx::Size tile_size(100, 100);
-  gfx::Size layer_bounds(400, 400);
-
-  scoped_refptr<FakePicturePileImpl> pending_pile =
-      FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
-  scoped_refptr<FakePicturePileImpl> active_pile =
-      FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
-
-  SetupTrees(pending_pile, active_pile);
-
-  std::vector<TileManager::PairedPictureLayer> paired_layers;
-  host_impl_.tile_manager()->GetPairedPictureLayers(&paired_layers);
-  EXPECT_EQ(0u, paired_layers.size());
-
-  // Update tile priorities will force the layer to register itself.
-  float dummy_contents_scale_x;
-  float dummy_contents_scale_y;
-  gfx::Size dummy_content_bounds;
-  active_layer_->CalculateContentsScale(1.f,
-                                        1.f,
-                                        1.f,
-                                        1.f,
-                                        false,
-                                        &dummy_contents_scale_x,
-                                        &dummy_contents_scale_y,
-                                        &dummy_content_bounds);
-  active_layer_->UpdateTilePriorities();
-  host_impl_.pending_tree()->UpdateDrawProperties();
-  pending_layer_->CalculateContentsScale(1.f,
-                                         1.f,
-                                         1.f,
-                                         1.f,
-                                         false,
-                                         &dummy_contents_scale_x,
-                                         &dummy_contents_scale_y,
-                                         &dummy_content_bounds);
-  pending_layer_->UpdateTilePriorities();
-
-  host_impl_.tile_manager()->GetPairedPictureLayers(&paired_layers);
-  EXPECT_EQ(1u, paired_layers.size());
-  EXPECT_EQ(active_layer_, paired_layers[0].active_layer);
-  EXPECT_EQ(pending_layer_, paired_layers[0].pending_layer);
-
-  // Destroy and recreate tile manager.
-  host_impl_.DidLoseOutputSurface();
-  scoped_ptr<TestWebGraphicsContext3D> context =
-      TestWebGraphicsContext3D::Create();
-  host_impl_.InitializeRenderer(
-      FakeOutputSurface::Create3d(context.Pass()).PassAs<OutputSurface>());
-
-  host_impl_.tile_manager()->GetPairedPictureLayers(&paired_layers);
-  EXPECT_EQ(0u, paired_layers.size());
-
-  active_layer_->CalculateContentsScale(1.f,
-                                        1.f,
-                                        1.f,
-                                        1.f,
-                                        false,
-                                        &dummy_contents_scale_x,
-                                        &dummy_contents_scale_y,
-                                        &dummy_content_bounds);
-  active_layer_->UpdateTilePriorities();
-  host_impl_.pending_tree()->UpdateDrawProperties();
-  pending_layer_->CalculateContentsScale(1.f,
-                                         1.f,
-                                         1.f,
-                                         1.f,
-                                         false,
-                                         &dummy_contents_scale_x,
-                                         &dummy_contents_scale_y,
-                                         &dummy_content_bounds);
-  pending_layer_->UpdateTilePriorities();
-
-  host_impl_.tile_manager()->GetPairedPictureLayers(&paired_layers);
-  EXPECT_EQ(1u, paired_layers.size());
-  EXPECT_EQ(active_layer_, paired_layers[0].active_layer);
-  EXPECT_EQ(pending_layer_, paired_layers[0].pending_layer);
-}
-
 TEST_F(NoLowResPictureLayerImplTest, InvalidViewportForPrioritizingTiles) {
   base::TimeTicks time_ticks;
   host_impl_.SetCurrentFrameTimeTicks(time_ticks);
 
   gfx::Size tile_size(100, 100);
   gfx::Size layer_bounds(400, 400);
 
   scoped_refptr<FakePicturePileImpl> pending_pile =
       FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
   scoped_refptr<FakePicturePileImpl> active_pile =
@@ skipping 261 matching lines @@
                                          1.f,   // maximum animation scale
                                          false,
                                          &result_scale_x,
                                          &result_scale_y,
                                          &result_bounds);
   EXPECT_EQ(1u, pending_layer_->tilings()->num_tilings());
 }
 
 }  // namespace
 }  // namespace cc