Reset property tree indices when layer is removed from layer tree

cc/layers/layer.h

 // Copyright 2010 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.
 
 #ifndef CC_LAYERS_LAYER_H_
 #define CC_LAYERS_LAYER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 458 matching lines @@
   }
   void reset_needs_push_properties_for_testing() {
     needs_push_properties_ = false;
   }
 
   virtual void RunMicroBenchmark(MicroBenchmark* benchmark);
 
   void Set3dSortingContextId(int id);
   int sorting_context_id() const { return sorting_context_id_; }
 
-  void set_transform_tree_index(int index) {
-    if (transform_tree_index_ == index)
-      return;
-    transform_tree_index_ = index;
-    SetNeedsPushProperties();
+  void set_property_tree_sequence_number(int sequence_number) {
+    property_tree_sequence_number_ = sequence_number;
   }
-  void set_clip_tree_index(int index) {
-    if (clip_tree_index_ == index)
-      return;
-    clip_tree_index_ = index;
-    SetNeedsPushProperties();
-  }
-  void set_opacity_tree_index(int index) {
-    if (opacity_tree_index_ == index)
-      return;
-    opacity_tree_index_ = index;
-    SetNeedsPushProperties();
-  }
-  int clip_tree_index() const { return clip_tree_index_; }
-  int transform_tree_index() const { return transform_tree_index_; }
-  int opacity_tree_index() const { return opacity_tree_index_; }
+
+  void SetTransformTreeIndex(int index);
+  int transform_tree_index() const;
+
+  void SetClipTreeIndex(int index);
+  int clip_tree_index() const;
+
+  void SetOpacityTreeIndex(int index);
+  int opacity_tree_index() const;
 
   void set_offset_to_transform_parent(gfx::Vector2dF offset) {
     if (offset_to_transform_parent_ == offset)
       return;
     offset_to_transform_parent_ = offset;
     SetNeedsPushProperties();
   }
   gfx::Vector2dF offset_to_transform_parent() const {
     return offset_to_transform_parent_;
   }
@@ skipping 192 matching lines @@
   gfx::ScrollOffset scroll_offset_;
   gfx::Vector2dF scroll_compensation_adjustment_;
   // This variable indicates which ancestor layer (if any) whose size,
   // transformed relative to this layer, defines the maximum scroll offset for
   // this layer.
   int scroll_clip_layer_id_;
   int num_descendants_that_draw_content_;
   int transform_tree_index_;
   int opacity_tree_index_;
   int clip_tree_index_;
+  int property_tree_sequence_number_;
   int num_layer_or_descendants_with_copy_request_;
   int num_layer_or_descendants_with_input_handler_;
   gfx::Vector2dF offset_to_transform_parent_;
   bool should_flatten_transform_from_property_tree_ : 1;
   bool should_scroll_on_main_thread_ : 1;
   bool have_wheel_event_handlers_ : 1;
   bool have_scroll_event_handlers_ : 1;
   bool user_scrollable_horizontal_ : 1;
   bool user_scrollable_vertical_ : 1;
   bool is_root_for_isolated_group_ : 1;
@@ skipping 52 matching lines @@
 
   std::vector<FrameTimingRequest> frame_timing_requests_;
   bool frame_timing_requests_dirty_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_H_