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

Unified Diff: cc/trees/property_tree_builder.cc

Issue 2693703010: cc: Remove support for disabling non-root render surfaces. (Closed)
Patch Set: softwaredraw-remove-no-surfaces: 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
Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 375051ac04087affe87b921490b34eb9c0e83702..3330fe5fedc4b0ab7124e63da99a5f5fb42463ce 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -400,11 +400,6 @@ void AddClipNodeIfNeeded(const DataForRecursion<LayerType>& data_from_ancestor,
data_for_children->apply_ancestor_clip = true;
}
- // Without surfaces, all non-viewport clips have to be applied using layer
- // clipping.
- bool layers_are_clipped_when_surfaces_disabled =
- layer_clips_subtree || parent->layers_are_clipped_when_surfaces_disabled;
-
// Render surface's clip is needed during hit testing. So, we need to create
// a clip node for every render surface.
bool requires_node = layer_clips_subtree || created_render_surface;
@@ -412,8 +407,6 @@ void AddClipNodeIfNeeded(const DataForRecursion<LayerType>& data_from_ancestor,
if (!requires_node) {
data_for_children->clip_tree_parent = parent_id;
DCHECK_EQ(layers_are_clipped, parent->layers_are_clipped);
- DCHECK_EQ(layers_are_clipped_when_surfaces_disabled,
- parent->layers_are_clipped_when_surfaces_disabled);
} else {
LayerType* transform_parent = data_for_children->transform_tree_parent;
if (PositionConstraint(layer).is_fixed_position() &&
@@ -453,8 +446,6 @@ void AddClipNodeIfNeeded(const DataForRecursion<LayerType>& data_from_ancestor,
}
node.resets_clip = has_unclipped_surface;
node.layers_are_clipped = layers_are_clipped;
- node.layers_are_clipped_when_surfaces_disabled =
- layers_are_clipped_when_surfaces_disabled;
data_for_children->clip_tree_parent =
data_for_children->property_trees->clip_tree.Insert(node, parent_id);
« no previous file with comments | « cc/trees/property_tree.cc ('k') | third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698