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

cc/trees/layer_tree_host_impl.cc

Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 29b3f9c8938c971e0e407f00b171c12baddbf47a..9e91fd0c136076e6c1a83c96190c7c7f59058297 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1240,21 +1240,21 @@ void LayerTreeHostImpl::NotifyReadyToActivate() {
   client_->NotifyReadyToActivate();
 }
 
-void LayerTreeHostImpl::NotifyTileInitialized(const Tile* tile) {
-  TRACE_EVENT0("cc", "LayerTreeHostImpl::NotifyTileInitialized");
+void LayerTreeHostImpl::NotifyTileStateChanged(const Tile* tile) {
+  TRACE_EVENT0("cc", "LayerTreeHostImpl::NotifyTileStateChanged");
 
   if (active_tree_) {
     LayerImpl* layer_impl =
         active_tree_->FindActiveTreeLayerById(tile->layer_id());
     if (layer_impl)
-      layer_impl->NotifyTileInitialized(tile);
+      layer_impl->NotifyTileStateChanged(tile);
   }
 
   if (pending_tree_) {
     LayerImpl* layer_impl =
         pending_tree_->FindPendingTreeLayerById(tile->layer_id());
     if (layer_impl)
-      layer_impl->NotifyTileInitialized(tile);
+      layer_impl->NotifyTileStateChanged(tile);
   }
 }
 
@@ -1845,8 +1845,7 @@ void LayerTreeHostImpl::CreateAndSetTileManager(
     ResourceProvider* resource_provider,
     ContextProvider* context_provider,
     bool use_zero_copy,
-    bool use_one_copy,
-    bool allow_rasterize_on_demand) {
+    bool use_one_copy) {
   DCHECK(settings_.impl_side_painting);
   DCHECK(resource_provider);
   DCHECK(proxy_->ImplThreadTaskRunner());
@@ -1894,10 +1893,10 @@ void LayerTreeHostImpl::CreateAndSetTileManager(
       proxy_->ImplThreadTaskRunner(), resource_provider, context_provider);
   tile_manager_ =
       TileManager::Create(this,
+                          proxy_->ImplThreadTaskRunner(),
                           resource_pool_.get(),
                           raster_worker_pool_->AsRasterizer(),
                           direct_raster_worker_pool_->AsRasterizer(),
-                          allow_rasterize_on_demand,
                           rendering_stats_instrumentation_);
 
   UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy());
@@ -1963,12 +1962,10 @@ bool LayerTreeHostImpl::InitializeRenderer(
                         GetRendererCapabilities().using_map_image &&
                         resource_provider->use_sync_query();
 
-    CreateAndSetTileManager(
-        resource_provider.get(),
-        output_surface->context_provider().get(),
-        use_zero_copy,
-        use_one_copy,
-        GetRendererCapabilities().allow_rasterize_on_demand);
+    CreateAndSetTileManager(resource_provider.get(),
+                            output_surface->context_provider().get(),
+                            use_zero_copy,
+                            use_one_copy);
   }
 
   // Initialize vsync parameters to sane values.
@@ -2041,11 +2038,7 @@ void LayerTreeHostImpl::ReleaseGL() {
 
   EnforceZeroBudget(true);
   DCHECK(GetRendererCapabilities().using_map_image);
-  CreateAndSetTileManager(resource_provider_.get(),
-                          NULL,
-                          true,
-                          false,
-                          GetRendererCapabilities().allow_rasterize_on_demand);
+  CreateAndSetTileManager(resource_provider_.get(), NULL, true, false);
   DCHECK(tile_manager_);
 
   client_->SetNeedsCommitOnImplThread();