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

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 2707643002: Temporarily suppress element id collision DCHECK for SPV2 (Closed)
Patch Set: 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index a231d6f5728ae093705f735f91bb635a48e651eb..757510486dd206461fde97f34c6aad00907cfefd 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -554,7 +554,12 @@ void LayerTreeImpl::AddToElementMap(LayerImpl* layer) {
LayerImpl* existing_layer = LayerByElementId(element_id);
bool element_id_collision_detected =
existing_layer && existing_layer != layer;
- DCHECK(!element_id_collision_detected);
+
+ // TODO(pdr): Remove this suppression and always check for id collisions.
+ // This is a temporary suppression for SPV2 which generates unnecessary
+ // layers that collide. Remove once crbug.com/693693 is fixed.
+ if (!settings().use_layer_lists)
+ DCHECK(!element_id_collision_detected);
#endif
element_layers_map_[element_id] = layer->id();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698