| 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 bbae5e78d4b232c58c75610644f580c063eec876..963a78a01ccb2205709ee8a8603819497c87fe92 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -750,10 +750,8 @@ bool LayerTreeHostImpl::CalculateRenderPasses(FrameData* frame) {
|
| RemoveRenderPasses(CullRenderPassesWithNoQuads(), frame);
|
| if (!output_surface_->ForcedDrawToSoftwareDevice())
|
| renderer_->DecideRenderPassAllocationsForFrame(frame->render_passes);
|
| - if (renderer_) {
|
| - RemoveRenderPasses(CullRenderPassesWithCachedTextures(renderer_.get()),
|
| - frame);
|
| - }
|
| + RemoveRenderPasses(CullRenderPassesWithCachedTextures(renderer_.get()),
|
| + frame);
|
|
|
| // If we're making a frame to draw, it better have at least one render pass.
|
| DCHECK(!frame->render_passes.empty());
|
| @@ -1221,8 +1219,7 @@ void LayerTreeHostImpl::DidDrawAllLayers(const FrameData& frame) {
|
|
|
| // Once all layers have been drawn, pending texture uploads should no
|
| // longer block future uploads.
|
| - if (resource_provider_)
|
| - resource_provider_->MarkPendingUploadsAsNonBlocking();
|
| + resource_provider_->MarkPendingUploadsAsNonBlocking();
|
| }
|
|
|
| void LayerTreeHostImpl::FinishAllRendering() {
|
|
|