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

Unified Diff: cc/trees/draw_property_utils.cc

Issue 1918593002: cc : Stop pushing properties not used by LayerImpl to LayerImpl (3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/test/layer_tree_host_common_test.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/draw_property_utils.cc
diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc
index f8fc1181f00ed714c678ccd2ca0db2c2557d0881..67a8b70ded00a042bf0b08f3e85484b03a43d1f9 100644
--- a/cc/trees/draw_property_utils.cc
+++ b/cc/trees/draw_property_utils.cc
@@ -47,6 +47,12 @@ static LayerImpl* EffectNodeOwner(LayerImpl* layer) {
return layer->layer_tree_impl()->LayerById(node->owner_id);
}
+static void inline ValidateIsNotRootForIsolatedGroup(Layer* layer) {
+ DCHECK(!layer->is_root_for_isolated_group()) << "layer: " << layer->id();
+}
+
+static void inline ValidateIsNotRootForIsolatedGroup(LayerImpl* layer) {}
+
template <typename LayerType>
static void ValidateRenderSurfaceForLayer(LayerType* layer) {
// This test verifies that there are no cases where a LayerImpl needs
@@ -61,8 +67,8 @@ static void ValidateRenderSurfaceForLayer(LayerType* layer) {
return;
DCHECK(!layer->mask_layer()) << "layer: " << layer->id();
DCHECK(!layer->replica_layer()) << "layer: " << layer->id();
- DCHECK(!layer->is_root_for_isolated_group()) << "layer: " << layer->id();
DCHECK(!layer->HasCopyRequest()) << "layer: " << layer->id();
+ ValidateIsNotRootForIsolatedGroup(layer);
}
static void ValidateRenderSurfacesRecursive(Layer* layer) {
« no previous file with comments | « cc/test/layer_tree_host_common_test.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698