Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / views / top_icon_animation_view.cc

diff --git a/src/ui/app_list/views/top_icon_animation_view.cc b/src/ui/app_list/views/top_icon_animation_view.cc
index 521f092..8ec6921 100644 (file)
--- a/src/ui/app_list/views/top_icon_animation_view.cc
+++ b/src/ui/app_list/views/top_icon_animation_view.cc
@@ -30,6 +30,9 @@ TopIconAnimationView::TopIconAnimationView(const gfx::ImageSkia& icon,
 }
 
 TopIconAnimationView::~TopIconAnimationView() {
+  // Required due to RequiresNotificationWhenAnimatorDestroyed() returning true.
+  // See ui::LayerAnimationObserver for details.
+  StopObservingImplicitAnimations();
 }
 
 void TopIconAnimationView::AddObserver(TopIconAnimationObserver* observer) {
@@ -80,4 +83,8 @@ void TopIconAnimationView::OnImplicitAnimationsCompleted() {
   delete this;
 }
 
+bool TopIconAnimationView::RequiresNotificationWhenAnimatorDestroyed() const {
+  return true;
+}
+
 }  // namespace app_list