Reland "cc: Remove layers that are not drawn from tile manager."

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 1c04d077f106ecabe69a71cd6b4d5482b4f5aceb..0f13a93466ae6361196d6620a3e16c4fa35b66de 100644
--- a/cc/resources/tile_manager.cc
+++ b/cc/resources/tile_manager.cc
@@ -678,6 +678,19 @@ void TileManager::GetTilesWithAssignedBins(PrioritizedTileSet* tiles) {
   }
 }
 
+void TileManager::CleanUpLayers() {
+  for (size_t i = 0; i < layers_.size(); ++i) {
+    if (layers_[i]->IsDrawnRenderSurfaceLayerListMember())
+      continue;
+
+    layers_[i]->DidUnregisterLayer();
+    std::swap(layers_[i], layers_.back());
+    layers_.pop_back();
+    --i;
+    prioritized_tiles_dirty_ = true;
+  }
+}
+
 void TileManager::ManageTiles(const GlobalStateThatImpactsTilePriority& state) {
   TRACE_EVENT0("cc", "TileManager::ManageTiles");
 
@@ -687,6 +700,8 @@ void TileManager::ManageTiles(const GlobalStateThatImpactsTilePriority& state) {
     prioritized_tiles_dirty_ = true;
   }
 
+  CleanUpLayers();
+
   // We need to call CheckForCompletedTasks() once in-between each call
   // to ScheduleTasks() to prevent canceled tasks from being scheduled.
   if (!did_check_for_completed_tasks_since_last_schedule_tasks_) {