| Index: cc/layers/layer_impl.h
|
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
|
| index fdb8218bfde197a11ec1affdf3e485516900edb9..91c9aeb7481ca555efc9f5fae11b764fcdca7cea 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_; }
|
| + LayerImplTestProperties* test_properties() {
|
| + if (!test_properties_)
|
| + test_properties_.reset(new LayerImplTestProperties());
|
| + return test_properties_.get();
|
| + }
|
|
|
| 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_;
|
|
|
| + std::unique_ptr<LayerImplTestProperties> test_properties_;
|
| +
|
| gfx::Vector2dF bounds_delta_;
|
|
|
| // Properties synchronized from the associated Layer.
|
| - gfx::Point3F transform_origin_;
|
| gfx::Size bounds_;
|
| int scroll_clip_layer_id_;
|
|
|
|
|