Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Side by Side Diff: cc/blink/web_scroll_offset_animation_curve_impl.cc

Issue 693883004: Make cc::animation::TrimTimeToCurrentIteration,cc::AnimationCurve::Duration use TimeTicks/TimeDelta (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/base/time_util.h ('k') | cc/cc.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 21 matching lines...) Expand all
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 = curve_->GetValue(time);
38 return WebFloatPoint(value.x(), value.y()); 38 return WebFloatPoint(value.x(), value.y());
39 } 39 }
40 40
41 double WebScrollOffsetAnimationCurveImpl::duration() const { 41 double WebScrollOffsetAnimationCurveImpl::duration() const {
42 return curve_->Duration(); 42 return curve_->Duration().InSecondsF();
43 } 43 }
44 44
45 scoped_ptr<cc::AnimationCurve> 45 scoped_ptr<cc::AnimationCurve>
46 WebScrollOffsetAnimationCurveImpl::CloneToAnimationCurve() const { 46 WebScrollOffsetAnimationCurveImpl::CloneToAnimationCurve() const {
47 return curve_->Clone(); 47 return curve_->Clone();
48 } 48 }
49 49
50 } // namespace cc_blink 50 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/base/time_util.h ('k') | cc/cc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698