| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "views/animation/bounds_animator.h" | 5 #include "views/animation/bounds_animator.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "ui/base/animation/animation_container.h" | 8 #include "ui/base/animation/animation_container.h" |
| 9 #include "ui/base/animation/slide_animation.h" | 9 #include "ui/base/animation/slide_animation.h" |
| 10 #include "views/view.h" | 10 #include "views/view.h" |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 if (!repaint_bounds_.IsEmpty()) { | 244 if (!repaint_bounds_.IsEmpty()) { |
| 245 // Adjust for rtl. | 245 // Adjust for rtl. |
| 246 repaint_bounds_.set_x(parent_->GetMirroredXWithWidthInView( | 246 repaint_bounds_.set_x(parent_->GetMirroredXWithWidthInView( |
| 247 repaint_bounds_.x(), repaint_bounds_.width())); | 247 repaint_bounds_.x(), repaint_bounds_.width())); |
| 248 parent_->SchedulePaintInRect(repaint_bounds_); | 248 parent_->SchedulePaintInRect(repaint_bounds_); |
| 249 repaint_bounds_.SetRect(0, 0, 0, 0); | 249 repaint_bounds_.SetRect(0, 0, 0, 0); |
| 250 } | 250 } |
| 251 | 251 |
| 252 if (observer_ && !IsAnimating()) { | 252 if (observer_ && !IsAnimating()) { |
| 253 // Notify here rather than from AnimationXXX to avoid deleting the animation | 253 // Notify here rather than from AnimationXXX to avoid deleting the animation |
| 254 // while the animaion is calling us. | 254 // while the animation is calling us. |
| 255 observer_->OnBoundsAnimatorDone(this); | 255 observer_->OnBoundsAnimatorDone(this); |
| 256 } | 256 } |
| 257 } | 257 } |
| 258 | 258 |
| 259 void BoundsAnimator::AnimationContainerEmpty(AnimationContainer* container) { | 259 void BoundsAnimator::AnimationContainerEmpty(AnimationContainer* container) { |
| 260 } | 260 } |
| 261 | 261 |
| 262 } // namespace views | 262 } // namespace views |
| OLD | NEW |