Chromium Code Reviews| Index: cc/layers/layer_impl.h |
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
| index fdb8218bfde197a11ec1affdf3e485516900edb9..4a9d9fbd461a37c417b22145a74424b7d662854d 100644 |
| --- a/cc/layers/layer_impl.h |
| +++ b/cc/layers/layer_impl.h |
| @@ -25,6 +25,7 @@ |
| #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" |
| @@ -238,8 +239,11 @@ class CC_EXPORT LayerImpl { |
| 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
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_; } |
| @@ -637,10 +641,11 @@ class CC_EXPORT LayerImpl { |
| 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_; |