Stops animations when removing a window from its parent

ui/aura/window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/window.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 12 matching lines @@
 #include "ui/aura/env.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event_target_iterator.h"
-#include "ui/gfx/animation/multi_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/scoped_canvas.h"
 #include "ui/gfx/screen.h"
 
 namespace aura {
 
 namespace {
 
 ui::LayerType WindowLayerTypeToUILayerType(WindowLayerType window_layer_type) {
@@ skipping 965 matching lines @@
                                              return_tightest,
                                              for_event_handling);
     if (match)
       return match;
   }
 
   return delegate_ ? this : NULL;
 }
 
 void Window::RemoveChildImpl(Window* child, Window* new_parent) {
+  // Stop (and complete) an ongoing animation to make sure bounds are updated
+  // before updating the layers bounds again.
+  if (child->layer() && child->layer()->GetAnimator())
+    child->layer()->GetAnimator()->StopAnimating();

[Ben Goodger (Google), 2014/04/25 03:28:01]

Is it possible to do this in the layer's RemoveChild instead of Window's?

[varkha, 2014/04/25 04:41:45]

Yes, it would make more sense. I'll explore it. Thanks for the idea.

[varkha, 2014/04/25 07:13:12]

Done.

   if (layout_manager_)
     layout_manager_->OnWillRemoveWindowFromLayout(child);
   FOR_EACH_OBSERVER(WindowObserver, observers_, OnWillRemoveWindow(child));
   Window* root_window = child->GetRootWindow();
   Window* new_root_window = new_parent ? new_parent->GetRootWindow() : NULL;
   if (root_window && root_window != new_root_window)
     child->NotifyRemovingFromRootWindow(new_root_window);
 
   gfx::Vector2d offset;
   GetAncestorWithLayer(&offset);
@@ skipping 408 matching lines @@
       return window;
     if (offset)
       *offset += window->bounds().OffsetFromOrigin();
   }
   if (offset)
     *offset = gfx::Vector2d();
   return NULL;
 }
 
 }  // namespace aura