From 97a311466bc7db336d8315587ff1b2ec06f7ea9c Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Tue, 8 Feb 2011 00:09:16 +0000 Subject: Rework basic bounds methods on View to match new V2 API: SetBounds(const gfx::Rect& rect) -> SetBoundsRect(); DidChangeBounds()->OnBoundsChanged() GetLocalBounds(false)->GetLocalBounds() GetLocalBounds(true)->GetContentsBounds() Moved GetBounds(), GetX(), and GetPosition into RTL section. http://crbug.com/72040 TEST=none Review URL: http://codereview.chromium.org/6410109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74052 0039d316-1c4b-4281-b951-d872f2087c98 --- views/animation/bounds_animator.cc | 2 +- views/animation/bounds_animator_unittest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'views/animation') diff --git a/views/animation/bounds_animator.cc b/views/animation/bounds_animator.cc index 4ba8d86..652f743 100644 --- a/views/animation/bounds_animator.cc +++ b/views/animation/bounds_animator.cc @@ -215,7 +215,7 @@ void BoundsAnimator::AnimationProgressed(const Animation* animation) { else repaint_bounds_ = repaint_bounds_.Union(total_bounds); - view->SetBounds(new_bounds); + view->SetBoundsRect(new_bounds); } if (data.delegate) diff --git a/views/animation/bounds_animator_unittest.cc b/views/animation/bounds_animator_unittest.cc index c234b1f..ba4b93b 100644 --- a/views/animation/bounds_animator_unittest.cc +++ b/views/animation/bounds_animator_unittest.cc @@ -115,7 +115,7 @@ class BoundsAnimatorTest : public testing::Test { TEST_F(BoundsAnimatorTest, AnimateViewTo) { TestAnimationDelegate delegate; gfx::Rect initial_bounds(0, 0, 10, 10); - child()->SetBounds(initial_bounds); + child()->SetBoundsRect(initial_bounds); gfx::Rect target_bounds(10, 10, 20, 20); animator()->AnimateViewTo(child(), target_bounds); animator()->SetAnimationDelegate(child(), &delegate, false); -- cgit v1.1