ui/gfx/interpolated_transform.cc - Issue 23531053: ui/base/animation -> ui/gfx/animation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/interpolated_transform.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge 2 trunk Created 7 years, 3 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:

Index: ui/gfx/interpolated_transform.cc

diff --git a/ui/gfx/interpolated_transform.cc b/ui/gfx/interpolated_transform.cc

index 583c27f05b9988a7d011ddd7d67496fd1e5df126..b9698b160cdc522282e138624e04076af31fca76 100644

--- a/ui/gfx/interpolated_transform.cc

+++ b/ui/gfx/interpolated_transform.cc

@@ -11,7 +11,7 @@

#endif

#include "base/logging.h"

-#include "ui/base/animation/tween.h"

+#include "ui/gfx/animation/tween.h"

namespace {

@@ -125,7 +125,8 @@ inline float InterpolatedTransform::ValueBetween(float time,

return end_value;

float t = (time - start_time_) / (end_time_ - start_time_);

- return static_cast<float>(Tween::ValueBetween(t, start_value, end_value));

+ return static_cast<float>(

+ gfx::Tween::ValueBetween(t, start_value, end_value));

}

///////////////////////////////////////////////////////////////////////////////

« no previous file with comments | « ui/gfx/gfx_export.h ('k') | ui/message_center/views/message_center_view.h » ('j') | no next file with comments »