WIP - loop in LayoutManager for preferred size changes (2)

ui/views/view.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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 145 matching lines @@
 // static
 const char View::kViewClassName[] = "views/View";
 
 ////////////////////////////////////////////////////////////////////////////////
 // View, public:
 
 // Creation and lifetime -------------------------------------------------------
 
 View::View()
     : owned_by_client_(false),
+      weak_ptr_factory_(this),
       id_(0),
       group_(-1),
       parent_(NULL),
       visible_(true),
       enabled_(true),
       notify_enter_exit_on_child_(false),
       registered_for_visible_bounds_notification_(false),
       clip_insets_(0, 0, 0, 0),
       needs_layout_(true),
       focus_border_(FocusBorder::CreateDashedFocusBorder()),
@@ skipping 413 matching lines @@
       child->needs_layout_ = false;
       child->Layout();
     }
   }
 }
 
 void View::InvalidateLayout() {
   // Always invalidate up. This is needed to handle the case of us already being
   // valid, but not our parent.
   needs_layout_ = true;
-  if (parent_)
-    parent_->InvalidateLayout();
+  // Schedule a layout
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&View::LayoutIfNeeded,
+                 weak_ptr_factory_.GetWeakPtr()));
 }
 
 LayoutManager* View::GetLayoutManager() const {
   return layout_manager_.get();
 }
 
 void View::SetLayoutManager(LayoutManager* layout_manager) {
   if (layout_manager_.get())
     layout_manager_->Uninstalled(this);
 
@@ skipping 633 matching lines @@
 int View::GetLineScrollIncrement(ScrollView* scroll_view,
                                  bool is_horizontal, bool is_positive) {
   return 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // View, protected:
 
 // Size and disposition --------------------------------------------------------
 
-void View::OnBoundsChanged(const gfx::Rect& previous_bounds) {
+void View::ChildPreferredSizeChanged(View* child) {
+  if (layout_manager_)
+    layout_manager_->OnChildPreferredSizeChanged(this, child);
 }
 
 void View::PreferredSizeChanged() {
   InvalidateLayout();
   if (parent_)
     parent_->ChildPreferredSizeChanged(this);
 }
 
 bool View::NeedsNotificationWhenVisibleBoundsChange() const {
   return false;
@@ skipping 550 matching lines @@
 }
 
 void View::PropagateNativeThemeChanged(const ui::NativeTheme* theme) {
   for (int i = 0, count = child_count(); i < count; ++i)
     child_at(i)->PropagateNativeThemeChanged(theme);
   OnNativeThemeChanged(theme);
 }
 
 // Size and disposition --------------------------------------------------------
 
+void View::LayoutIfNeeded() {
+  if (needs_layout_)
+    Layout();
+}
+
 void View::PropagateVisibilityNotifications(View* start, bool is_visible) {
   for (int i = 0, count = child_count(); i < count; ++i)
     child_at(i)->PropagateVisibilityNotifications(start, is_visible);
   VisibilityChangedImpl(start, is_visible);
 }
 
 void View::VisibilityChangedImpl(View* starting_from, bool is_visible) {
   VisibilityChanged(starting_from, is_visible);
 }
 
@@ skipping 463 matching lines @@
   ConvertPointToWidget(this, &widget_location);
   GetWidget()->RunShellDrag(this, data, widget_location, drag_operations,
       source);
   return true;
 #else
   return false;
 #endif  // !defined(OS_MACOSX)
 }
 
 }  // namespace views