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 5546ea33d36ce5773120089d2538164aaec607e9..b8ff9b3e42a6d723939885af7983e190d2f66300 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -1585,14 +1585,17 @@ void LayerTreeHostImpl::CreateAndSetRenderer( |
void LayerTreeHostImpl::CreateAndSetTileManager( |
ResourceProvider* resource_provider, |
- bool using_map_image) { |
+ bool using_map_image, |
+ ContextProvider* context_provider) { |
DCHECK(settings_.impl_side_painting); |
DCHECK(resource_provider); |
tile_manager_ = TileManager::Create(this, |
resource_provider, |
settings_.num_raster_threads, |
rendering_stats_instrumentation_, |
- using_map_image); |
+ using_map_image, |
+ context_provider); |
+ |
UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy()); |
need_to_update_visible_tiles_before_draw_ = false; |
} |
@@ -1636,7 +1639,8 @@ bool LayerTreeHostImpl::InitializeRenderer( |
if (settings_.impl_side_painting) { |
CreateAndSetTileManager(resource_provider.get(), |
- GetRendererCapabilities().using_map_image); |
+ GetRendererCapabilities().using_map_image, |
+ output_surface->context_provider().get()); |
} |
// Setup BeginFrameEmulation if it's not supported natively |
@@ -1748,7 +1752,9 @@ void LayerTreeHostImpl::ReleaseGL() { |
EnforceZeroBudget(true); |
CreateAndSetTileManager(resource_provider_.get(), |
- GetRendererCapabilities().using_map_image); |
+ GetRendererCapabilities().using_map_image, |
+ NULL); |
+ |
DCHECK(tile_manager_); |
SetOffscreenContextProvider(NULL); |