| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/layers/layer_position_constraint.h" | 5 #include "cc/layers/layer_position_constraint.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "cc/layers/layer.h" | 9 #include "cc/layers/layer.h" |
| 10 #include "cc/layers/layer_impl.h" | 10 #include "cc/layers/layer_impl.h" |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 LayerPositionConstraint fixed_to_bottom_right_; | 193 LayerPositionConstraint fixed_to_bottom_right_; |
| 194 | 194 |
| 195 // LayerImpl should not be aware of synced property logics, this function is | 195 // LayerImpl should not be aware of synced property logics, this function is |
| 196 // a hack for the test to arbitrarily set the scroll delta for setting up. | 196 // a hack for the test to arbitrarily set the scroll delta for setting up. |
| 197 static void SetScrollOffsetDelta(LayerImpl* layer_impl, | 197 static void SetScrollOffsetDelta(LayerImpl* layer_impl, |
| 198 const gfx::Vector2dF& delta) { | 198 const gfx::Vector2dF& delta) { |
| 199 if (layer_impl->layer_tree_impl() | 199 if (layer_impl->layer_tree_impl() |
| 200 ->property_trees() | 200 ->property_trees() |
| 201 ->scroll_tree.SetScrollOffsetDeltaForTesting(layer_impl->id(), | 201 ->scroll_tree.SetScrollOffsetDeltaForTesting(layer_impl->id(), |
| 202 delta)) | 202 delta)) |
| 203 layer_impl->layer_tree_impl()->DidUpdateScrollOffset( | 203 layer_impl->layer_tree_impl()->DidUpdateScrollOffset(layer_impl->id()); |
| 204 layer_impl->id(), layer_impl->transform_tree_index()); | |
| 205 } | 204 } |
| 206 }; | 205 }; |
| 207 | 206 |
| 208 namespace { | 207 namespace { |
| 209 | 208 |
| 210 void SetFixedContainerSizeDelta(LayerImpl* scroll_layer, | 209 void SetFixedContainerSizeDelta(LayerImpl* scroll_layer, |
| 211 const gfx::Vector2d& delta) { | 210 const gfx::Vector2d& delta) { |
| 212 DCHECK(scroll_layer); | 211 DCHECK(scroll_layer); |
| 213 DCHECK(scroll_layer->scrollable()); | 212 DCHECK(scroll_layer->scrollable()); |
| 214 | 213 |
| (...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1165 VerifySerializeAndDeserializeProto(true, false, true); | 1164 VerifySerializeAndDeserializeProto(true, false, true); |
| 1166 VerifySerializeAndDeserializeProto(true, false, false); | 1165 VerifySerializeAndDeserializeProto(true, false, false); |
| 1167 VerifySerializeAndDeserializeProto(false, true, true); | 1166 VerifySerializeAndDeserializeProto(false, true, true); |
| 1168 VerifySerializeAndDeserializeProto(false, true, false); | 1167 VerifySerializeAndDeserializeProto(false, true, false); |
| 1169 VerifySerializeAndDeserializeProto(false, false, true); | 1168 VerifySerializeAndDeserializeProto(false, false, true); |
| 1170 VerifySerializeAndDeserializeProto(false, false, false); | 1169 VerifySerializeAndDeserializeProto(false, false, false); |
| 1171 } | 1170 } |
| 1172 | 1171 |
| 1173 } // namespace | 1172 } // namespace |
| 1174 } // namespace cc | 1173 } // namespace cc |
| OLD | NEW |