Chromium Code Reviews| Index: cc/layers/layer_impl.h |
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h |
| index 8b09e2e3a8d827cdb2d86fa817feafd8c4dbd280..38695591324d239660a96d63323c8ed22cbce63d 100644 |
| --- a/cc/layers/layer_impl.h |
| +++ b/cc/layers/layer_impl.h |
| @@ -17,6 +17,7 @@ |
| #include "cc/base/scoped_ptr_vector.h" |
| #include "cc/input/input_handler.h" |
| #include "cc/layers/draw_properties.h" |
| +#include "cc/layers/layer_position_constraint.h" |
| #include "cc/layers/render_surface_impl.h" |
| #include "cc/quads/render_pass.h" |
| #include "cc/quads/shared_quad_state.h" |
| @@ -162,10 +163,19 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver { |
| return is_container_for_fixed_position_layers_; |
| } |
| - void SetFixedToContainerLayer(bool fixed) { |
| - fixed_to_container_layer_ = fixed; |
| + void SetFixedContainerSizeDelta(const gfx::Vector2dF& delta) { |
| + fixed_container_size_delta_ = delta; |
| + } |
| + const gfx::Vector2dF& fixed_container_size_delta() const { |
| + return fixed_container_size_delta_; |
| + } |
| + |
| + void SetPositionConstraint(const LayerPositionConstraint& constraint) { |
| + position_constraint_ = constraint; |
| + } |
| + const LayerPositionConstraint& position_constraint() const { |
| + return position_constraint_; |
| } |
| - bool fixed_to_container_layer() const { return fixed_to_container_layer_; } |
| void SetPreserves3d(bool preserves_3d); |
| bool preserves_3d() const { return preserves_3d_; } |
| @@ -475,9 +485,10 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver { |
| // Set for the layer that other layers are fixed to. |
| bool is_container_for_fixed_position_layers_; |
| - // This is true if the layer should be fixed to the closest ancestor |
| - // container. |
| - bool fixed_to_container_layer_; |
| + // This property is effective when m_isContainerForFixedPositionLayers == true, |
|
Sami
2013/03/25 11:41:37
s/m_isContainerForFixedPositionLayers/is_container
trchen
2013/03/26 01:45:28
Done.
|
| + gfx::Vector2dF fixed_container_size_delta_; |
| + |
| + LayerPositionConstraint position_constraint_; |
| gfx::Vector2dF scroll_delta_; |
| gfx::Vector2d sent_scroll_delta_; |