diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 17:46:15 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 17:46:15 +0000 |
commit | 655750cba246a2e3049867c3b200ca478f883230 (patch) | |
tree | 581ae4bdfb37aa3673619c021ca5796348dcb70e /chrome/browser/gtk/slide_animator_gtk.cc | |
parent | 87373acb051a898a2b6cbb56be05fc3f4d3a75bc (diff) | |
download | chromium_src-655750cba246a2e3049867c3b200ca478f883230.zip chromium_src-655750cba246a2e3049867c3b200ca478f883230.tar.gz chromium_src-655750cba246a2e3049867c3b200ca478f883230.tar.bz2 |
Remove code doing a no-op due to float -> int rounding.
Make implicit float -> int/long conversions explicit.
(Implicit float -> int conversions can be found by compiling with
-Wconversion in gcc [versions 4.1.1 and 4.2.4, and surely many others].)
Landing the patch for Jacob Mandelson, original review: http://codereview.chromium.org/201091
BUG=none
TEST=app_unittests & base_unittests
Review URL: http://codereview.chromium.org/200122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/slide_animator_gtk.cc')
-rw-r--r-- | chrome/browser/gtk/slide_animator_gtk.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/slide_animator_gtk.cc b/chrome/browser/gtk/slide_animator_gtk.cc index 0508f6f..b6837fc 100644 --- a/chrome/browser/gtk/slide_animator_gtk.cc +++ b/chrome/browser/gtk/slide_animator_gtk.cc @@ -111,8 +111,8 @@ bool SlideAnimatorGtk::IsAnimating() { } void SlideAnimatorGtk::AnimationProgressed(const Animation* animation) { - int showing_height = child_->allocation.height * - animation_->GetCurrentValue(); + int showing_height = static_cast<int>(child_->allocation.height * + animation_->GetCurrentValue()); if (direction_ == DOWN) { gtk_fixed_move(GTK_FIXED(widget_.get()), child_, 0, showing_height - child_->allocation.height); |