cc: Re-enable prepaint for GPU rasterization

cc/resources/tile_manager.cc

Index: cc/resources/tile_manager.cc
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
index dff3a52f871ac6a80cd05b77e92fc25ab6b14fed..4812df220b9d7c10345f71b5e5af080cbe8fdadf 100644
--- a/cc/resources/tile_manager.cc
+++ b/cc/resources/tile_manager.cc
@@ -364,7 +364,7 @@ void TileManager::PrepareTiles(
 
     TileVector tiles_that_need_to_be_rasterized;
     AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized,
-                           scheduled_raster_task_limit_, false);
+                           scheduled_raster_task_limit_);
 
     // Schedule tile tasks.
     ScheduleTasks(tiles_that_need_to_be_rasterized);
@@ -375,7 +375,7 @@ void TileManager::PrepareTiles(
     if (global_state_.hard_memory_limit_in_bytes == 0) {
       TileVector tiles_that_need_to_be_rasterized;
       AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized,
-                             scheduled_raster_task_limit_, false);
+                             scheduled_raster_task_limit_);
       DCHECK(tiles_that_need_to_be_rasterized.empty());
     }
 
@@ -407,7 +407,7 @@ void TileManager::SynchronouslyRasterizeTiles(
 
   TileVector tiles_that_need_to_be_rasterized;
   AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized,
-                         std::numeric_limits<size_t>::max(), true);
+                         std::numeric_limits<size_t>::max());
 
   // We must reduce the amount of unused resources before calling
   // RunTasks to prevent usage from rising above limits.
@@ -555,8 +555,7 @@ bool TileManager::TilePriorityViolatesMemoryPolicy(
 
 void TileManager::AssignGpuMemoryToTiles(
     TileVector* tiles_that_need_to_be_rasterized,
-    size_t scheduled_raster_task_limit,
-    bool required_for_draw_only) {
+    size_t scheduled_raster_task_limit) {
   TRACE_EVENT_BEGIN0("cc", "TileManager::AssignGpuMemoryToTiles");
 
   // Maintain the list of released resources that can potentially be re-used
@@ -585,15 +584,6 @@ void TileManager::AssignGpuMemoryToTiles(
 
   while (!raster_priority_queue_.IsEmpty()) {
     Tile* tile = raster_priority_queue_.Top();
-
-    // TODO(vmpstr): Remove this when the iterator returns the correct tiles
-    // to draw for GPU rasterization.
-    if (required_for_draw_only) {
-      if (!tile->required_for_draw()) {
-        raster_priority_queue_.Pop();
-        continue;
-      }
-    }
     TilePriority priority = tile->combined_priority();
 
     if (TilePriorityViolatesMemoryPolicy(priority)) {
@@ -951,7 +941,7 @@ void TileManager::CheckIfMoreTilesNeedToBePrepared() {
   // where top-priority tiles are initialized.
   TileVector tiles_that_need_to_be_rasterized;
   AssignGpuMemoryToTiles(&tiles_that_need_to_be_rasterized,
-                         scheduled_raster_task_limit_, false);
+                         scheduled_raster_task_limit_);
 
   // |tiles_that_need_to_be_rasterized| will be empty when we reach a
   // steady memory state. Keep scheduling tasks until we reach this state.