Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 16211002: Skip drawing unsupported layers in forced software mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Add test. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/solid_color_layer_impl.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « cc/layers/solid_color_layer_impl.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698