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

Unified Diff: ui/gfx/animation/linear_animation.cc

Issue 649203003: Type conversion fixes, ui/gfx/ edition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile Created 6 years, 2 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 | « no previous file | ui/gfx/animation/tween.cc » ('j') | ui/gfx/animation/tween.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/animation/linear_animation.cc
diff --git a/ui/gfx/animation/linear_animation.cc b/ui/gfx/animation/linear_animation.cc
index b3f3df0e0c94d67bb6448dd72f2df766abd48390..0c9fa6326fc38df9a7162d1c717285230be81e97 100644
--- a/ui/gfx/animation/linear_animation.cc
+++ b/ui/gfx/animation/linear_animation.cc
@@ -48,7 +48,7 @@ double LinearAnimation::GetCurrentValue() const {
void LinearAnimation::SetCurrentValue(double new_value) {
new_value = std::max(0.0, std::min(1.0, new_value));
base::TimeDelta time_delta = base::TimeDelta::FromMicroseconds(
- duration_.InMicroseconds() * (new_value - state_));
+ static_cast<int64>(duration_.InMicroseconds() * (new_value - state_)));
SetStartTime(start_time() - time_delta);
state_ = new_value;
}
« no previous file with comments | « no previous file | ui/gfx/animation/tween.cc » ('j') | ui/gfx/animation/tween.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698