cc : Stop pushing transform origin from Layer and LayerImpl.

cc/layers/layer_impl.h

 // Copyright 2011 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_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "cc/animation/target_property.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/region.h"
 #include "cc/base/synced_property.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/draw_properties.h"
 #include "cc/layers/layer_collections.h"
+#include "cc/layers/layer_impl_test_properties.h"
 #include "cc/layers/layer_position_constraint.h"
 #include "cc/layers/performance_properties.h"
 #include "cc/layers/render_surface_impl.h"
 #include "cc/output/filter_operations.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/tiles/tile_priority.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/geometry/point3_f.h"
@@ skipping 193 matching lines @@
   virtual ScrollbarLayerImplBase* ToScrollbarLayer();
 
   // Returns true if this layer has content to draw.
   void SetDrawsContent(bool draws_content);
   bool DrawsContent() const { return draws_content_; }
 
   int NumDescendantsThatDrawContent() const;
   void SetHideLayerAndSubtree(bool hide);
   bool hide_layer_and_subtree() const { return hide_layer_and_subtree_; }
 
-  void SetTransformOrigin(const gfx::Point3F& transform_origin);
-  gfx::Point3F transform_origin() const { return transform_origin_; }
+  void SetTransformOriginForTesting(const gfx::Point3F& transform_origin);
+  gfx::Point3F transform_origin_for_testing() const {

[ajuma, 2016/04/20 18:09:52]

This approach is fine for this CL, but as we move (or after we move) more things
into LayerImplTestProperties, we should move these getters/setters onto that
class, and only expose TestProperties() getter on LayerImpl (that returns a
lazily allocated LayerImplTestProperties instance).

[jaydasika, 2016/04/20 18:46:06]

Done.

+    return test_properties_ ? test_properties_->transform_origin
+                            : gfx::Point3F();
+  }
 
   void SetBackgroundColor(SkColor background_color);
   SkColor background_color() const { return background_color_; }
   void SetSafeOpaqueBackgroundColor(SkColor background_color);
   // If contents_opaque(), return an opaque color else return a
   // non-opaque color.  Tries to return background_color(), if possible.
   SkColor SafeOpaqueBackgroundColor() const;
 
   void SetFilters(const FilterOperations& filters);
   const FilterOperations& filters() const { return filters_; }
@@ skipping 377 matching lines @@
 
   // mask_layer_ can be temporarily stolen during tree sync, we need this ID to
   // confirm newly assigned layer is still the previous one
   int mask_layer_id_;
   LayerImpl* mask_layer_;
   int replica_layer_id_;  // ditto
   LayerImpl* replica_layer_;
   int layer_id_;
   LayerTreeImpl* layer_tree_impl_;
 
+  struct LayerImplTestProperties* test_properties_;

[ajuma, 2016/04/20 18:09:52]

This needs to be a unique_ptr.

[jaydasika, 2016/04/20 18:46:06]

Done.

+
   gfx::Vector2dF bounds_delta_;
 
   // Properties synchronized from the associated Layer.
-  gfx::Point3F transform_origin_;
   gfx::Size bounds_;
   int scroll_clip_layer_id_;
 
   gfx::Vector2dF offset_to_transform_parent_;
   uint32_t main_thread_scrolling_reasons_;
 
   bool user_scrollable_horizontal_ : 1;
   bool user_scrollable_vertical_ : 1;
   // Whether the "back" of this layer should draw.
   bool double_sided_ : 1;
@@ skipping 93 matching lines @@
   bool scrolls_drawn_descendant_;
   // If true, the layer or one of its descendants has a touch handler.
   bool layer_or_descendant_has_touch_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_