diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 00:09:16 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-08 00:09:16 +0000 |
| commit | 97a311466bc7db336d8315587ff1b2ec06f7ea9c (patch) | |
| tree | 524babd269504a1a13a6a9874014d0dd52fc25ea /views/animation | |
| parent | 9d333fa174e9653dcbe60e525d4c03628bb217ae (diff) | |
| download | chromium_src-97a311466bc7db336d8315587ff1b2ec06f7ea9c.zip chromium_src-97a311466bc7db336d8315587ff1b2ec06f7ea9c.tar.gz chromium_src-97a311466bc7db336d8315587ff1b2ec06f7ea9c.tar.bz2 | |
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
Diffstat (limited to 'views/animation')
| -rw-r--r-- | views/animation/bounds_animator.cc | 2 | ||||
| -rw-r--r-- | views/animation/bounds_animator_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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); |