| Index: cc/trees/property_tree.cc
|
| diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
|
| index 58555f3017b82eb528340bcacb9510666308cfaf..8dafe9b7cdd6c0958bcb0fa60734634faffb6739 100644
|
| --- a/cc/trees/property_tree.cc
|
| +++ b/cc/trees/property_tree.cc
|
| @@ -978,6 +978,7 @@ void EffectTree::ClearCopyRequests() {
|
| for (auto& node : nodes()) {
|
| node.subtree_has_copy_request = false;
|
| node.has_copy_request = false;
|
| + node.closest_ancestor_with_copy_request_id = EffectTree::kInvalidNodeId;
|
| }
|
|
|
| // Any copy requests that are still left will be aborted (sending an empty
|
| @@ -986,22 +987,6 @@ void EffectTree::ClearCopyRequests() {
|
| set_needs_update(true);
|
| }
|
|
|
| -int EffectTree::ClosestAncestorWithCopyRequest(int id) const {
|
| - DCHECK_GE(id, EffectTree::kRootNodeId);
|
| - const EffectNode* node = Node(id);
|
| - while (node->id > EffectTree::kContentsRootNodeId) {
|
| - if (node->has_copy_request)
|
| - return node->id;
|
| -
|
| - node = parent(node);
|
| - }
|
| -
|
| - if (node->has_copy_request)
|
| - return node->id;
|
| - else
|
| - return EffectTree::kInvalidNodeId;
|
| -}
|
| -
|
| int EffectTree::LowestCommonAncestorWithRenderSurface(int id_1,
|
| int id_2) const {
|
| DCHECK(GetRenderSurface(id_1));
|
|
|