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

Unified Diff: cc/trees/property_tree_builder.cc

Issue 1800923002: cc: Directly use property trees to calculate clip rect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up and try Created 4 years, 9 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
« cc/trees/property_tree.h ('K') | « cc/trees/property_tree.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 0ebbca960191d451f75e7e7e0b7e234a50315d4e..41033e8165a54b1f11e0d658e44e0a5ee63fb8d7 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -26,6 +26,7 @@ namespace {
static const int kInvalidPropertyTreeNodeId = -1;
static const int kRootPropertyTreeNodeId = 0;
+static const int kViewportClipTreeNodeId = 1;
template <typename LayerType>
struct DataForRecursion {
@@ -624,6 +625,8 @@ bool AddEffectNodeIfNeeded(
// transform id.
node.data.transform_id =
data_from_ancestor.transform_tree->next_available_id();
+ node.data.has_unclipped_descendants =
+ (layer->num_unclipped_descendants() != 0);
}
node.data.clip_id = data_from_ancestor.clip_tree_parent;
} else {
@@ -632,7 +635,7 @@ bool AddEffectNodeIfNeeded(
// factor) and clip node created from root layer (include viewports) applies
// to root render surface's content, but not root render surface itself.
node.data.transform_id = kRootPropertyTreeNodeId;
- node.data.clip_id = kRootPropertyTreeNodeId;
+ node.data.clip_id = kViewportClipTreeNodeId;
}
data_for_children->effect_tree_parent =
data_for_children->effect_tree->Insert(node, parent_id);
« cc/trees/property_tree.h ('K') | « cc/trees/property_tree.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698