Compute if a layer is clipped outside CalcDrawProps

cc/trees/property_tree_builder.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/property_tree_builder.h"
 
 #include <map>
 #include <set>
 
 #include "cc/base/math_util.h"
@@ skipping 82 matching lines @@
 
 template <typename LayerType>
 void AddClipNodeIfNeeded(const DataForRecursion<LayerType>& data_from_ancestor,
                          LayerType* layer,
                          bool created_transform_node,
                          DataForRecursion<LayerType>* data_for_children) {
   ClipNode* parent = GetClipParent(data_from_ancestor, layer);
   int parent_id = parent->id;
 
   bool ancestor_clips_subtree =
-      data_from_ancestor.ancestor_clips_subtree || layer->clip_parent();
+      data_from_ancestor.ancestor_clips_subtree ||
+      (layer->clip_parent() &&
+       layer->clip_parent()->is_clipped_from_property_tree());

[ajuma, 2015/07/09 14:50:15]

This looks like a logic change (since we're now checking is_clipped in addition
to checking whether we have a clip parent). Is there a test that fails without
this?

[jaydasika, 2015/07/09 15:11:49]

Yes. LayerTreeHostCommonTest.LayerTreeRebuildTest crashes without it.
It crashes at the CHECK_EQ inside cdp that is added as a part of this patch

 
   data_for_children->ancestor_clips_subtree = false;
   bool has_unclipped_surface = false;
 
   if (layer->has_render_surface()) {
     if (ancestor_clips_subtree && layer->num_unclipped_descendants() > 0)
       data_for_children->ancestor_clips_subtree = true;
     else if (!ancestor_clips_subtree && !layer->num_unclipped_descendants())
       has_unclipped_surface = true;
   } else {
@@ skipping 24 matching lines @@
         data_for_children->render_target->transform_tree_index();
     node.owner_id = layer->id();
 
     data_for_children->clip_tree_parent =
         data_for_children->clip_tree->Insert(node, parent_id);
   }
 
   layer->SetClipTreeIndex(
       has_unclipped_surface ? 0 : data_for_children->clip_tree_parent);
 
+  layer->set_is_clipped_from_property_tree(
+      data_for_children->ancestor_clips_subtree);
+
   // TODO(awoloszyn): Right now when we hit a node with a replica, we reset the
   // clip for all children since we may need to draw. We need to figure out a
   // better way, since we will need both the clipped and unclipped versions.
 }
 
 template <typename LayerType>
 bool AddTransformNodeIfNeeded(
     const DataForRecursion<LayerType>& data_from_ancestor,
     LayerType* layer,
     DataForRecursion<LayerType>* data_for_children) {
@@ skipping 339 matching lines @@
     const gfx::Rect& viewport,
     const gfx::Transform& device_transform,
     PropertyTrees* property_trees) {
   BuildPropertyTreesTopLevelInternal(
       root_layer, page_scale_layer, inner_viewport_scroll_layer,
       outer_viewport_scroll_layer, page_scale_factor, device_scale_factor,
       viewport, device_transform, property_trees);
 }
 
 }  // namespace cc