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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/layer.cc

Issue 2681183002: cc: Add flag to disable future mask tiling. (Closed)
Patch Set: Correct my mistake in rebase. Created 3 years, 10 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 | « no previous file | cc/layers/picture_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 2b4566a539e0545d7e7c843b7869c66447dd4e50..be0070ce3da30c08c87f9d40c8666c83d63bb46f 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -419,7 +419,9 @@ void Layer::SetMaskLayer(Layer* mask_layer) {
inputs_.mask_layer->RemoveFromParent();
DCHECK(!inputs_.mask_layer->parent());
inputs_.mask_layer->SetParent(this);
- if (inputs_.filters.IsEmpty()) {
+ if (inputs_.filters.IsEmpty() &&
+ (!layer_tree_host_ ||
+ layer_tree_host_->GetSettings().enable_mask_tiling)) {
inputs_.mask_layer->SetLayerMaskType(
Layer::LayerMaskType::MULTI_TEXTURE_MASK);
} else {
« no previous file with comments | « no previous file | cc/layers/picture_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698