aura: Window should notify WindowDelegate of bounds changed if Layer cannot.

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 579 matching lines @@
 
   // Ensure we don't go smaller than our minimum bounds.
   if (delegate_) {
     const gfx::Size& min_size = delegate_->GetMinimumSize();
     actual_new_bounds.set_width(
         std::max(min_size.width(), actual_new_bounds.width()));
     actual_new_bounds.set_height(
         std::max(min_size.height(), actual_new_bounds.height()));
   }
 
+  gfx::Rect old_bounds = GetTargetBounds();
+
   // Always need to set the layer's bounds -- even if it is to the same thing.
   // This may cause important side effects such as stopping animation.
   layer_->SetBounds(actual_new_bounds);
+
+  // If we are currently not the layer's delegate, we will not get bounds
+  // changed notification from the layer. We must notify ourselves.

[sky, 2012/06/12 21:19:39]

Can you add: this typically happens after animating hidden.

[varunjain, 2012/06/12 21:28:21]

Done.

+  if (layer_->delegate() != this)
+    OnLayerBoundsChanged(old_bounds, ContainsMouse());
 }
 
 void Window::SetVisible(bool visible) {
   if (visible == layer_->GetTargetVisibility())
     return;  // No change.
 
   RootWindow* root_window = GetRootWindow();
   if (client::GetVisibilityClient(root_window)) {
     client::GetVisibilityClient(root_window)->UpdateLayerVisibility(
         this, visible);
@@ skipping 193 matching lines @@
   if (root_window)
     root_window->OnWindowBoundsChanged(this, contained_mouse);
 }
 
 void Window::OnPaintLayer(gfx::Canvas* canvas) {
   if (delegate_)
     delegate_->OnPaint(canvas);
 }
 
 base::Closure Window::PrepareForLayerBoundsChange() {
-  bool contains_mouse = false;
-  if (IsVisible()) {
-    RootWindow* root_window = GetRootWindow();
-    contains_mouse =
-        root_window && ContainsPointInRoot(root_window->last_mouse_location());
-  }
   return base::Bind(&Window::OnLayerBoundsChanged, base::Unretained(this),
-                    bounds(), contains_mouse);
+                    bounds(), ContainsMouse());
 }
 
 void Window::UpdateLayerName(const std::string& name) {
 #if !defined(NDEBUG)
   DCHECK(layer());
 
   std::string layer_name(name_);
   if (layer_name.empty())
     layer_name.append("Unnamed Window");
 
   if (id_ != -1) {
     char id_buf[10];
     base::snprintf(id_buf, sizeof(id_buf), " %d", id_);
     layer_name.append(id_buf);
   }
   layer()->set_name(layer_name);
 #endif
 }
 
+bool Window::ContainsMouse() {
+  bool contains_mouse = false;
+  if (IsVisible()) {
+    RootWindow* root_window = GetRootWindow();
+    contains_mouse =
+        root_window && ContainsPointInRoot(root_window->last_mouse_location());
+  }
+  return contains_mouse;
+}
+
 #ifndef NDEBUG
 std::string Window::GetDebugInfo() const {
   return StringPrintf(
       "%s<%d> bounds(%d, %d, %d, %d) %s",
       name().empty() ? "Unknown" : name().c_str(), id(),
       bounds().x(), bounds().y(), bounds().width(), bounds().height(),
       IsVisible() ? "Visible" : "Hidden");
 }
 
 void Window::PrintWindowHierarchy(int depth) const {
   printf("%*s%s\n", depth * 2, "", GetDebugInfo().c_str());
   for (Windows::const_reverse_iterator it = children_.rbegin(),
            rend = children_.rend();
        it != rend; ++it) {
     Window* child = *it;
     child->PrintWindowHierarchy(depth + 1);
   }
 }
 #endif
 
 }  // namespace aura