cc:: Add transform nodes at boundaries of 3d rendering contexts

cc/trees/property_tree.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 <stddef.h>
 
 #include <set>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 107 matching lines @@
 
 template class PropertyTree<TransformNode>;
 template class PropertyTree<ClipNode>;
 template class PropertyTree<EffectNode>;
 template class PropertyTree<ScrollNode>;
 
 TransformNodeData::TransformNodeData()
     : target_id(-1),
       content_target_id(-1),
       source_node_id(-1),
+      sorting_context_id(0),
       needs_local_transform_update(true),
       is_invertible(true),
       ancestors_are_invertible(true),
       is_animated(false),
       to_screen_is_animated(false),
       has_only_translation_animations(true),
       to_screen_has_scale_animation(false),
       flattens_inherited_transform(false),
       node_and_ancestors_are_flat(true),
       node_and_ancestors_have_only_integer_translation(true),
@@ skipping 14 matching lines @@
 }
 
 bool TransformNodeData::operator==(const TransformNodeData& other) const {
   return pre_local == other.pre_local && local == other.local &&
          post_local == other.post_local && to_parent == other.to_parent &&
          to_target == other.to_target && from_target == other.from_target &&
          to_screen == other.to_screen && from_screen == other.from_screen &&
          target_id == other.target_id &&
          content_target_id == other.content_target_id &&
          source_node_id == other.source_node_id &&
+         sorting_context_id == other.sorting_context_id &&
          needs_local_transform_update == other.needs_local_transform_update &&
          is_invertible == other.is_invertible &&
          ancestors_are_invertible == other.ancestors_are_invertible &&
          is_animated == other.is_animated &&
          to_screen_is_animated == other.to_screen_is_animated &&
          has_only_translation_animations ==
              other.has_only_translation_animations &&
          to_screen_has_scale_animation == other.to_screen_has_scale_animation &&
          flattens_inherited_transform == other.flattens_inherited_transform &&
          node_and_ancestors_are_flat == other.node_and_ancestors_are_flat &&
@@ skipping 57 matching lines @@
 
   TransformToProto(to_target, data->mutable_to_target());
   TransformToProto(from_target, data->mutable_from_target());
 
   TransformToProto(to_screen, data->mutable_to_screen());
   TransformToProto(from_screen, data->mutable_from_screen());
 
   data->set_target_id(target_id);
   data->set_content_target_id(content_target_id);
   data->set_source_node_id(source_node_id);
+  data->set_sorting_context_id(sorting_context_id);
 
   data->set_needs_local_transform_update(needs_local_transform_update);
 
   data->set_is_invertible(is_invertible);
   data->set_ancestors_are_invertible(ancestors_are_invertible);
 
   data->set_is_animated(is_animated);
   data->set_to_screen_is_animated(to_screen_is_animated);
   data->set_has_only_translation_animations(has_only_translation_animations);
   data->set_to_screen_has_scale_animation(to_screen_has_scale_animation);
@@ skipping 44 matching lines @@
 
   to_target = ProtoToTransform(data.to_target());
   from_target = ProtoToTransform(data.from_target());
 
   to_screen = ProtoToTransform(data.to_screen());
   from_screen = ProtoToTransform(data.from_screen());
 
   target_id = data.target_id();
   content_target_id = data.content_target_id();
   source_node_id = data.source_node_id();
+  sorting_context_id = data.sorting_context_id();
 
   needs_local_transform_update = data.needs_local_transform_update();
 
   is_invertible = data.is_invertible();
   ancestors_are_invertible = data.ancestors_are_invertible();
 
   is_animated = data.is_animated();
   to_screen_is_animated = data.to_screen_is_animated();
   has_only_translation_animations = data.has_only_translation_animations();
   to_screen_has_scale_animation = data.to_screen_has_scale_animation();
@@ skipping 948 matching lines @@
   effect_tree.FromProtobuf(proto.effect_tree());
   clip_tree.FromProtobuf(proto.clip_tree());
   scroll_tree.FromProtobuf(proto.scroll_tree());
 
   needs_rebuild = proto.needs_rebuild();
   non_root_surfaces_enabled = proto.non_root_surfaces_enabled();
   sequence_number = proto.sequence_number();
 }
 
 }  // namespace cc