Add ClipNode when Render Surface Inherits Clip

cc/trees/property_tree_builder.cc

Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 8ad44070ec7ffdf6d648c6356e6673153b9366d3..5d8c1a902eb1bccbc3e16a95ab70bfda8f4a78ee 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -122,7 +122,7 @@ void AddClipNodeIfNeeded(const DataForRecursion<LayerType>& data_from_ancestor,
     parent_id = 0;
 
   if (!RequiresClipNode(layer, data_from_ancestor, parent->data.transform_id,
-                        data_for_children->ancestor_clips_subtree)) {
+                        ancestor_clips_subtree)) {
     // Unclipped surfaces reset the clip rect.
     data_for_children->clip_tree_parent = parent_id;
   } else {
@@ -138,6 +138,9 @@ void AddClipNodeIfNeeded(const DataForRecursion<LayerType>& data_from_ancestor,
     node.data.target_id =
         data_for_children->render_target->transform_tree_index();
     node.owner_id = layer->id();
+    node.data.render_surface_applies_clip = false;
+    if (layer->has_render_surface() && ancestor_clips_subtree)
+      node.data.render_surface_applies_clip = true;
 
     data_for_children->clip_tree_parent =
         data_for_children->clip_tree->Insert(node, parent_id);