Re-land: cc: Examine layers to determine if we're ready to activate.

cc/resources/tile_manager_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/resources/tile.h"
 #include "cc/resources/tile_priority.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
@@ skipping 14 matching lines @@
  public:
   typedef std::vector<scoped_refptr<Tile> > TileVector;
 
   TileManagerTest()
       : memory_limit_policy_(ALLOW_ANYTHING),
         max_tiles_(0),
         ready_to_activate_(false) {}
 
   void Initialize(int max_tiles,
                   TileMemoryLimitPolicy memory_limit_policy,
-                  TreePriority tree_priority,
-                  bool allow_on_demand_raster = true) {
+                  TreePriority tree_priority) {
     output_surface_ = FakeOutputSurface::Create3d();
     CHECK(output_surface_->BindToClient(&output_surface_client_));
 
     shared_bitmap_manager_.reset(new TestSharedBitmapManager());
     resource_provider_ = ResourceProvider::Create(
         output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1,
         false);
     resource_pool_ = ResourcePool::Create(
         resource_provider_.get(), GL_TEXTURE_2D, RGBA_8888);
-    tile_manager_ = make_scoped_ptr(new FakeTileManager(
-        this, resource_pool_.get(), allow_on_demand_raster));
+    tile_manager_ =
+        make_scoped_ptr(new FakeTileManager(this, resource_pool_.get()));
 
     memory_limit_policy_ = memory_limit_policy;
     max_tiles_ = max_tiles;
     picture_pile_ = FakePicturePileImpl::CreateInfiniteFilledPile();
 
     SetTreePriority(tree_priority);
   }
 
   void SetTreePriority(TreePriority tree_priority) {
     GlobalStateThatImpactsTilePriority state;
@@ skipping 20 matching lines @@
 
   virtual void TearDown() OVERRIDE {
     tile_manager_.reset(NULL);
     picture_pile_ = NULL;
 
     testing::Test::TearDown();
   }
 
   // TileManagerClient implementation.
   virtual void NotifyReadyToActivate() OVERRIDE { ready_to_activate_ = true; }
-  virtual void NotifyTileInitialized(const Tile* tile) OVERRIDE {}
+  virtual void NotifyTileStateChanged(const Tile* tile) OVERRIDE {}
 
   TileVector CreateTilesWithSize(int count,
                                  TilePriority active_priority,
                                  TilePriority pending_priority,
                                  const gfx::Size& tile_size) {
     TileVector tiles;
     for (int i = 0; i < count; ++i) {
       scoped_refptr<Tile> tile = tile_manager_->CreateTile(picture_pile_.get(),
                                                            tile_size,
                                                            gfx::Rect(),
@@ skipping 495 matching lines @@
 
   tile_manager()->AssignMemoryToTiles(global_state_);
   tile_manager()->GetMemoryStats(&memory_required_bytes,
                                  &memory_nice_to_have_bytes,
                                  &memory_allocated_bytes,
                                  &memory_used_bytes);
   // Allocated bytes should never be more than the memory limit.
   EXPECT_LE(memory_allocated_bytes, global_state_.hard_memory_limit_in_bytes);
 }
 
-TEST_P(TileManagerTest, AllowRasterizeOnDemand) {
-  // Not enough memory to initialize tiles required for activation.
-  Initialize(0, ALLOW_ANYTHING, SAME_PRIORITY_FOR_BOTH_TREES);
-  TileVector tiles =
-      CreateTiles(2, TilePriority(), TilePriorityRequiredForActivation());
-
-  tile_manager()->AssignMemoryToTiles(global_state_);
-
-  // This should make required tiles ready to draw by marking them as
-  // required tiles for on-demand raster.
-  tile_manager()->DidFinishRunningTasksForTesting();
-
-  EXPECT_TRUE(ready_to_activate());
-  for (TileVector::iterator it = tiles.begin(); it != tiles.end(); ++it)
-    EXPECT_TRUE((*it)->IsReadyToDraw());
-}
-
-TEST_P(TileManagerTest, PreventRasterizeOnDemand) {
-  // Not enough memory to initialize tiles required for activation.
-  Initialize(0, ALLOW_ANYTHING, SAME_PRIORITY_FOR_BOTH_TREES, false);
-  TileVector tiles =
-      CreateTiles(2, TilePriority(), TilePriorityRequiredForActivation());
-
-  tile_manager()->AssignMemoryToTiles(global_state_);
-
-  // This should make required tiles ready to draw by marking them as
-  // required tiles for on-demand raster.
-  tile_manager()->DidFinishRunningTasksForTesting();
-
-  EXPECT_TRUE(ready_to_activate());
-  for (TileVector::iterator it = tiles.begin(); it != tiles.end(); ++it)
-    EXPECT_FALSE((*it)->IsReadyToDraw());
-}
-
 // If true, the max tile limit should be applied as bytes; if false,
 // as num_resources_limit.
 INSTANTIATE_TEST_CASE_P(TileManagerTests,
                         TileManagerTest,
                         ::testing::Values(true, false));
 
 class TileManagerTileIteratorTest : public testing::Test,
                                     public TileManagerClient {
  public:
   TileManagerTileIteratorTest()
@@ skipping 86 matching lines @@
   void CreateHighLowResAndSetAllTilesVisible() {
     // Active layer must get updated first so pending layer can share from it.
     active_layer_->CreateDefaultTilingsAndTiles();
     active_layer_->SetAllTilesVisible();
     pending_layer_->CreateDefaultTilingsAndTiles();
     pending_layer_->SetAllTilesVisible();
   }
 
   // TileManagerClient implementation.
   virtual void NotifyReadyToActivate() OVERRIDE { ready_to_activate_ = true; }
-  virtual void NotifyTileInitialized(const Tile* tile) OVERRIDE {}
+  virtual void NotifyTileStateChanged(const Tile* tile) OVERRIDE {}
 
   TileManager* tile_manager() { return host_impl_.tile_manager(); }
 
  protected:
   GlobalStateThatImpactsTilePriority global_state_;
 
   TestSharedBitmapManager shared_bitmap_manager_;
   TileMemoryLimitPolicy memory_limit_policy_;
   int max_tiles_;
   bool ready_to_activate_;
@@ skipping 378 matching lines @@
 
     last_tile = tile;
     new_content_tiles.insert(tile);
   }
 
   EXPECT_EQ(tile_count, new_content_tiles.size());
   EXPECT_EQ(all_tiles, new_content_tiles);
 }
 }  // namespace
 }  // namespace cc