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 84c43c20b1c3462b342036d0fbbc7311e9249e28..96d4fb91b46b36877c627b3e5119214eac2e1cc4 100644 |
| --- a/cc/trees/layer_tree_host_impl.cc |
| +++ b/cc/trees/layer_tree_host_impl.cc |
| @@ -603,6 +603,11 @@ bool LayerTreeHostImpl::CalculateRenderPasses(FrameData* frame) { |
| RenderPass* target_render_pass = |
| frame->render_passes_by_id[target_render_pass_id]; |
| + if (output_surface_->ForcedDrawToSoftwareDevice() && |
| + !it->CanDrawInTilelessSoftwareMode()) { |
| + continue; |
| + } |
| + |
| bool prevent_occlusion = it.target_render_surface_layer()->HasCopyRequest(); |
| occlusion_tracker.EnterLayer(it, prevent_occlusion); |
| @@ -641,6 +646,7 @@ bool LayerTreeHostImpl::CalculateRenderPasses(FrameData* frame) { |
| has_occlusion_from_outside_target_surface; |
| } else { |
| DCHECK_EQ(active_tree_, it->layer_tree_impl()); |
| + |
|
aelias_OOO_until_Jul13
2013/05/30 00:46:51
Nit: newline
|
| it->WillDraw(resource_provider_.get()); |
| frame->will_draw_layers.push_back(*it); |