Index: cc/animation/layer_animation_controller.cc |
diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc |
index 08a0ee91f1854cf4fc5020b50d8996803a9f1c01..93f2c5967155e954cae414736fc73e3017a39b13 100644 |
--- a/cc/animation/layer_animation_controller.cc |
+++ b/cc/animation/layer_animation_controller.cc |
@@ -534,7 +534,7 @@ void LayerAnimationController::PushNewAnimationsToImplThread( |
// Scroll animations always start at the current scroll offset. |
if (animations_[i]->target_property() == Animation::ScrollOffset) { |
- gfx::Vector2dF current_scroll_offset; |
+ gfx::ScrollOffset current_scroll_offset; |
if (controller_impl->value_provider_) { |
current_scroll_offset = |
controller_impl->value_provider_->ScrollOffsetForAnimation(); |
@@ -544,7 +544,7 @@ void LayerAnimationController::PushNewAnimationsToImplThread( |
current_scroll_offset = value_provider_->ScrollOffsetForAnimation(); |
} |
animations_[i]->curve()->ToScrollOffsetAnimationCurve()->SetInitialValue( |
- current_scroll_offset); |
+ current_scroll_offset.ToVector2dF()); |
danakj
2014/09/25 22:01:26
ScrollOffsetAnimationCurve should be ScrollOffsets
Yufeng Shen (Slow to review)
2014/09/26 20:19:07
Done.
|
} |
// The new animation should be set to run as soon as possible. |