| Index: trunk/src/cc/trees/layer_tree_host_impl.cc
|
| ===================================================================
|
| --- trunk/src/cc/trees/layer_tree_host_impl.cc (revision 272659)
|
| +++ trunk/src/cc/trees/layer_tree_host_impl.cc (working copy)
|
| @@ -1240,21 +1240,21 @@
|
| client_->NotifyReadyToActivate();
|
| }
|
|
|
| -void LayerTreeHostImpl::NotifyTileStateChanged(const Tile* tile) {
|
| - TRACE_EVENT0("cc", "LayerTreeHostImpl::NotifyTileStateChanged");
|
| +void LayerTreeHostImpl::NotifyTileInitialized(const Tile* tile) {
|
| + TRACE_EVENT0("cc", "LayerTreeHostImpl::NotifyTileInitialized");
|
|
|
| if (active_tree_) {
|
| LayerImpl* layer_impl =
|
| active_tree_->FindActiveTreeLayerById(tile->layer_id());
|
| if (layer_impl)
|
| - layer_impl->NotifyTileStateChanged(tile);
|
| + layer_impl->NotifyTileInitialized(tile);
|
| }
|
|
|
| if (pending_tree_) {
|
| LayerImpl* layer_impl =
|
| pending_tree_->FindPendingTreeLayerById(tile->layer_id());
|
| if (layer_impl)
|
| - layer_impl->NotifyTileStateChanged(tile);
|
| + layer_impl->NotifyTileInitialized(tile);
|
| }
|
| }
|
|
|
| @@ -1922,9 +1922,9 @@
|
|
|
| tile_manager_ =
|
| TileManager::Create(this,
|
| - proxy_->ImplThreadTaskRunner(),
|
| resource_pool_.get(),
|
| raster_worker_pool_->AsRasterizer(),
|
| + GetRendererCapabilities().allow_rasterize_on_demand,
|
| rendering_stats_instrumentation_);
|
|
|
| UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy());
|
|
|