WIP - loop in LayoutManager for preferred size changes

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 138 matching lines @@
 };
 
 }  // namespace internal
 
 // static
 ViewsDelegate* ViewsDelegate::views_delegate = NULL;
 
 // static
 const char View::kViewClassName[] = "views/View";
 
+ScopedMaybeLayout::ScopedMaybeLayout(views::View* view) : view_(view) {
+  view_->InvalidateLayout();
+}
+
+ScopedMaybeLayout::~ScopedMaybeLayout() {
+  if (view_->needs_layout_)
+    view_->Layout();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // View, public:
 
 // Creation and lifetime -------------------------------------------------------
 
 View::View()
     : owned_by_client_(false),
       id_(0),
       group_(-1),
       parent_(NULL),
@@ skipping 420 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();
+//  if (parent_)
+//    parent_->InvalidateLayout();
 }
 
 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();
+  ScopedMaybeLayout layout(this);
+//  InvalidateLayout();
   if (parent_)
     parent_->ChildPreferredSizeChanged(this);
+//  if (needs_layout_)
+//    Layout();
 }
 
 bool View::NeedsNotificationWhenVisibleBoundsChange() const {
   return false;
 }
 
 void View::OnVisibleBoundsChanged() {
 }
 
 // Tree operations -------------------------------------------------------------
@@ skipping 1027 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