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

Unified Diff: cc/trees/layer_tree_host_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
« no previous file with comments | « cc/trees/layer_tree_host.cc ('k') | cc/trees/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index f394d52494ea5750809c128277c1f25afb07d363..36af5ffbd9e3dd6d71715a22addc7ebb89b1d4e1 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2762,26 +2762,21 @@ void LayerTreeHostImpl::AnimatePageScale(base::TimeTicks monotonic_time) {
if (!page_scale_animation_)
return;
- // TODO(ajuma): http://crbug.com/178171 - Animations use double for monotonic
- // time.
- double monotonic_time_for_cc_animations =
- (monotonic_time - base::TimeTicks()).InSecondsF();
gfx::Vector2dF scroll_total = active_tree_->TotalScrollOffset();
if (!page_scale_animation_->IsAnimationStarted())
- page_scale_animation_->StartAnimation(monotonic_time_for_cc_animations);
+ page_scale_animation_->StartAnimation(monotonic_time);
- active_tree_->SetPageScaleDelta(page_scale_animation_->PageScaleFactorAtTime(
- monotonic_time_for_cc_animations) /
- active_tree_->page_scale_factor());
- gfx::Vector2dF next_scroll = page_scale_animation_->ScrollOffsetAtTime(
- monotonic_time_for_cc_animations);
+ active_tree_->SetPageScaleDelta(
+ page_scale_animation_->PageScaleFactorAtTime(monotonic_time) /
+ active_tree_->page_scale_factor());
+ gfx::Vector2dF next_scroll =
+ page_scale_animation_->ScrollOffsetAtTime(monotonic_time);
ScrollViewportBy(next_scroll - scroll_total);
SetNeedsRedraw();
- if (page_scale_animation_->IsAnimationCompleteAtTime(
- monotonic_time_for_cc_animations)) {
+ if (page_scale_animation_->IsAnimationCompleteAtTime(monotonic_time)) {
page_scale_animation_.reset();
client_->SetNeedsCommitOnImplThread();
client_->RenewTreePriority();
@@ -2811,17 +2806,12 @@ void LayerTreeHostImpl::AnimateLayers(base::TimeTicks monotonic_time) {
return;
TRACE_EVENT0("cc", "LayerTreeHostImpl::AnimateLayers");
-
- // TODO(ajuma): http://crbug.com/178171 - Animations use double for monotonic
- // time.
- double monotonic_time_for_cc_animations =
- (monotonic_time - base::TimeTicks()).InSecondsF();
AnimationRegistrar::AnimationControllerMap copy =
animation_registrar_->active_animation_controllers();
for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin();
iter != copy.end();
++iter)
- (*iter).second->Animate(monotonic_time_for_cc_animations);
+ (*iter).second->Animate(monotonic_time);
SetNeedsAnimate();
}
« no previous file with comments | « cc/trees/layer_tree_host.cc ('k') | cc/trees/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698