ui/views/animation/bounds_animator.cc - Issue 11270042: Add non-member non-mutating methods for common gfx::Rect operations.

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/views/animation/bounds_animator.cc

Issue 11270042: Add non-member non-mutating methods for common gfx::Rect operations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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:

Index: ui/views/animation/bounds_animator.cc

diff --git a/ui/views/animation/bounds_animator.cc b/ui/views/animation/bounds_animator.cc

index 037b9d6b5b64ea1509fabe62ae322735bfe073f6..05bea6c5ab604f420bca4c81045e5ed9e78625e3 100644

--- a/ui/views/animation/bounds_animator.cc

+++ b/ui/views/animation/bounds_animator.cc

@@ -235,8 +235,7 @@ void BoundsAnimator::AnimationProgressed(const Animation* animation) {

gfx::Rect new_bounds =

animation->CurrentValueBetween(data.start_bounds, data.target_bounds);

if (new_bounds != view->bounds()) {

- gfx::Rect total_bounds = view->bounds();

- total_bounds.Union(new_bounds);

+ gfx::Rect total_bounds = gfx::Union(new_bounds, view->bounds());

// Build up the region to repaint in repaint_bounds_. We'll do the repaint

// when all animations complete (in AnimationContainerProgressed).