| Index: cc/layers/layer_impl.h
|
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
|
| index b09cb3f4970792d56829a9899dcd48d048450527..fd8755dcbc4b847813dca60878c721554be33338 100644
|
| --- a/cc/layers/layer_impl.h
|
| +++ b/cc/layers/layer_impl.h
|
| @@ -360,12 +360,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| // them from the other values.
|
|
|
| void SetBounds(const gfx::Size& bounds);
|
| - void SetTemporaryImplBounds(const gfx::SizeF& bounds);
|
| gfx::Size bounds() const;
|
| - gfx::Vector2dF BoundsDelta() const {
|
| - return gfx::Vector2dF(temporary_impl_bounds_.width() - bounds_.width(),
|
| - temporary_impl_bounds_.height() - bounds_.height());
|
| - }
|
| + void SetBoundsDelta(const gfx::Vector2dF& bounds_delta);
|
| + gfx::Vector2dF bounds_delta() const { return bounds_delta_; }
|
|
|
| void SetContentBounds(const gfx::Size& content_bounds);
|
| gfx::Size content_bounds() const { return draw_properties_.content_bounds; }
|
| @@ -605,7 +602,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| // Properties synchronized from the associated Layer.
|
| gfx::Point3F transform_origin_;
|
| gfx::Size bounds_;
|
| - gfx::SizeF temporary_impl_bounds_;
|
| + gfx::Vector2dF bounds_delta_;
|
| gfx::Vector2d scroll_offset_;
|
| ScrollOffsetDelegate* scroll_offset_delegate_;
|
| LayerImpl* scroll_clip_layer_;
|
|
|