Chromium Code Reviews| 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 9ee229bd760f95dfdaffb42b388c3d9e7236bbfa..6d619bf45f7bf772e4118c3170e29ce7823d13e8 100644 |
| --- a/cc/trees/layer_tree_host_impl.cc |
| +++ b/cc/trees/layer_tree_host_impl.cc |
| @@ -1434,11 +1434,17 @@ bool LayerTreeHostImpl::InitializeRenderer( |
| return false; |
| if (settings_.impl_side_painting) { |
| + bool using_map_image = false; |
| + if (renderer() != NULL) { |
| + // Renderer may be NULL in unit tests. |
|
reveman
2013/05/22 23:51:49
is the problem not just that you're creating the r
kaanb
2013/05/22 23:59:27
Yes, I moved TileManager creation after the Render
|
| + using_map_image = GetRendererCapabilities().using_map_image; |
| + } |
| tile_manager_ = TileManager::Create(this, |
| resource_provider.get(), |
| settings_.num_raster_threads, |
| settings_.use_color_estimator, |
| - rendering_stats_instrumentation_); |
| + rendering_stats_instrumentation_, |
| + using_map_image); |
| UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy()); |
| } |