| 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 9259b34743b8906fbee1a0ac5a63a78b38d5e5c0..ea0a0115e063d59dc559444a7fe5db61d483f4de 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -1058,7 +1058,7 @@ DrawResult LayerTreeHostImpl::PrepareToDraw(FrameData* frame) {
|
| // This will cause NotifyTileStateChanged() to be called for any visible tiles
|
| // that completed, which will add damage to the frame for them so they appear
|
| // as part of the current frame being drawn.
|
| - if (settings().impl_side_painting)
|
| + if (tile_manager_)
|
| tile_manager_->UpdateVisibleTiles(global_tile_state_);
|
|
|
| frame->render_surface_layer_list = &active_tree_->RenderSurfaceLayerList();
|
| @@ -1698,7 +1698,8 @@ void LayerTreeHostImpl::UpdateViewportContainerSizes() {
|
| void LayerTreeHostImpl::SynchronouslyInitializeAllTiles() {
|
| // Only valid for the single-threaded non-scheduled/synchronous case
|
| // using the zero copy raster worker pool.
|
| - single_thread_synchronous_task_graph_runner_->RunUntilIdle();
|
| + if (tile_manager_)
|
| + single_thread_synchronous_task_graph_runner_->RunUntilIdle();
|
| }
|
|
|
| void LayerTreeHostImpl::DidLoseOutputSurface() {
|
| @@ -2129,7 +2130,7 @@ bool LayerTreeHostImpl::InitializeRenderer(
|
|
|
| CreateAndSetRenderer();
|
|
|
| - if (settings_.impl_side_painting)
|
| + if (settings_.impl_side_painting && settings_.raster_enabled)
|
| CreateAndSetTileManager();
|
| RecreateTreeResources();
|
|
|
|
|