OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/blink/web_scroll_offset_animation_curve_impl.h" | 5 #include "cc/blink/web_scroll_offset_animation_curve_impl.h" |
6 | 6 |
7 #include "cc/animation/scroll_offset_animation_curve.h" | 7 #include "cc/animation/scroll_offset_animation_curve.h" |
8 #include "cc/animation/timing_function.h" | 8 #include "cc/animation/timing_function.h" |
9 #include "cc/blink/web_animation_curve_common.h" | 9 #include "cc/blink/web_animation_curve_common.h" |
10 | 10 |
(...skipping 16 matching lines...) Expand all Loading... | |
27 WebScrollOffsetAnimationCurveImpl::type() const { | 27 WebScrollOffsetAnimationCurveImpl::type() const { |
28 return WebCompositorAnimationCurve::AnimationCurveTypeScrollOffset; | 28 return WebCompositorAnimationCurve::AnimationCurveTypeScrollOffset; |
29 } | 29 } |
30 | 30 |
31 void WebScrollOffsetAnimationCurveImpl::setInitialValue( | 31 void WebScrollOffsetAnimationCurveImpl::setInitialValue( |
32 WebFloatPoint initial_value) { | 32 WebFloatPoint initial_value) { |
33 curve_->SetInitialValue(gfx::ScrollOffset(initial_value.x, initial_value.y)); | 33 curve_->SetInitialValue(gfx::ScrollOffset(initial_value.x, initial_value.y)); |
34 } | 34 } |
35 | 35 |
36 WebFloatPoint WebScrollOffsetAnimationCurveImpl::getValue(double time) const { | 36 WebFloatPoint WebScrollOffsetAnimationCurveImpl::getValue(double time) const { |
37 gfx::ScrollOffset value = curve_->GetValue(time); | 37 gfx::ScrollOffset value = |
38 curve_->GetValue(base::TimeDelta::FromSeconds(time)); | |
ajuma
2014/11/14 15:12:33
This should be FromSecondsD.
(this is likely what'
patro
2014/11/17 13:26:47
Done.
| |
38 return WebFloatPoint(value.x(), value.y()); | 39 return WebFloatPoint(value.x(), value.y()); |
39 } | 40 } |
40 | 41 |
41 double WebScrollOffsetAnimationCurveImpl::duration() const { | 42 double WebScrollOffsetAnimationCurveImpl::duration() const { |
42 return curve_->Duration().InSecondsF(); | 43 return curve_->Duration().InSecondsF(); |
43 } | 44 } |
44 | 45 |
45 scoped_ptr<cc::AnimationCurve> | 46 scoped_ptr<cc::AnimationCurve> |
46 WebScrollOffsetAnimationCurveImpl::CloneToAnimationCurve() const { | 47 WebScrollOffsetAnimationCurveImpl::CloneToAnimationCurve() const { |
47 return curve_->Clone(); | 48 return curve_->Clone(); |
48 } | 49 } |
49 | 50 |
50 } // namespace cc_blink | 51 } // namespace cc_blink |
OLD | NEW |