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

Unified Diff: webkit/renderer/compositor_bindings/web_animation_impl.cc

Issue 231133002: CC::Animations should use TimeTicks & TimeDelta to represent time (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code changed as per review comments. Created 6 years, 7 months 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 side-by-side diff with in-line comments
Download patch
« cc/input/page_scale_animation.cc ('K') | « ui/compositor/layer_animator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/renderer/compositor_bindings/web_animation_impl.cc
diff --git a/webkit/renderer/compositor_bindings/web_animation_impl.cc b/webkit/renderer/compositor_bindings/web_animation_impl.cc
index 92d2fd46adead6c1b56b1f5abeadedd56be5ad64..b150a42b03e6ef99cb18600e3e39f31830808623 100644
--- a/webkit/renderer/compositor_bindings/web_animation_impl.cc
+++ b/webkit/renderer/compositor_bindings/web_animation_impl.cc
@@ -7,6 +7,7 @@
#include "cc/animation/animation.h"
#include "cc/animation/animation_curve.h"
#include "cc/animation/animation_id_provider.h"
+#include "cc/base/time_util.h"
ajuma 2014/05/07 17:04:42 Please remove, since this file no longer exists in
Sikugu_ 2014/05/12 16:01:53 Done.
#include "third_party/WebKit/public/platform/WebAnimation.h"
#include "third_party/WebKit/public/platform/WebAnimationCurve.h"
#include "webkit/renderer/compositor_bindings/web_filter_animation_curve_impl.h"
@@ -16,6 +17,7 @@
using cc::Animation;
using cc::AnimationIdProvider;
+using cc::TimeUtil;
ajuma 2014/05/07 17:04:42 Please remove.
Sikugu_ 2014/05/12 16:01:53 Done.
using blink::WebAnimation;
using blink::WebAnimationCurve;
@@ -81,18 +83,21 @@ int WebAnimationImpl::iterations() const { return animation_->iterations(); }
void WebAnimationImpl::setIterations(int n) { animation_->set_iterations(n); }
-double WebAnimationImpl::startTime() const { return animation_->start_time(); }
+double WebAnimationImpl::startTime() const {
+ return TimeUtil::TicksInSecondsF(animation_->start_time());
ajuma 2014/05/07 17:04:42 TimeUtil no longer exists in the latest patch set.
Sikugu_ 2014/05/12 16:01:53 Done.
+}
void WebAnimationImpl::setStartTime(double monotonic_time) {
- animation_->set_start_time(monotonic_time);
+ animation_->set_start_time(base::TimeTicks::FromInternalValue(
+ monotonic_time * base::Time::kMicrosecondsPerSecond));
}
double WebAnimationImpl::timeOffset() const {
- return animation_->time_offset();
+ return animation_->time_offset().InSecondsF();
}
void WebAnimationImpl::setTimeOffset(double monotonic_time) {
- animation_->set_time_offset(monotonic_time);
+ animation_->set_time_offset(base::TimeDelta::FromSeconds(monotonic_time));
ajuma 2014/05/07 17:04:42 FromSecondsD (or else we'll lose precision).
Sikugu_ 2014/05/12 16:01:53 Done.
}
#if WEB_ANIMATION_SUPPORTS_FULL_DIRECTION
« cc/input/page_scale_animation.cc ('K') | « ui/compositor/layer_animator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698