ash/system/tray/tray_item_view.cc - Issue 11418040: gfx::Transform API clean-up

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: ash/system/tray/tray_item_view.cc

Issue 11418040: gfx::Transform API clean-up (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years, 1 month 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: ash/system/tray/tray_item_view.cc

diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc

index 87644d08283cf8eb507ede15d6209c55a5aeecc0..b93163c42df9b340a202d3d1e618c1cdf612226a 100644

--- a/ash/system/tray/tray_item_view.cc

+++ b/ash/system/tray/tray_item_view.cc

@@ -95,10 +95,10 @@ void TrayItemView::ChildPreferredSizeChanged(views::View* child) {

void TrayItemView::AnimationProgressed(const ui::Animation* animation) {

gfx::Transform transform;

- transform.SetScale(animation->GetCurrentValue(),

- animation->GetCurrentValue());

- transform.ConcatTranslate(0, animation->CurrentValueBetween(

+ transform.Translate(0, animation->CurrentValueBetween(

static_cast<double>(height()) / 2, 0.));

+ transform.Scale(animation->GetCurrentValue(),

+ animation->GetCurrentValue());

layer()->SetTransform(transform);

PreferredSizeChanged();

}