rAc: reduce number of redundant layouts of DetailsContainerView

chrome/browser/ui/views/autofill/autofill_dialog_views.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 "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 222 matching lines @@
     views::View::OnPaint(canvas);
     DrawArrow(canvas, width() / 2.0f, color_, SK_ColorTRANSPARENT);
   }
 
  private:
   SkColor color_;
 
   DISALLOW_COPY_AND_ASSIGN(ErrorBubbleContents);
 };
 
-// A view that runs a callback whenever its bounds change.
-class DetailsContainerView : public views::View {
- public:
-  explicit DetailsContainerView(const base::Closure& callback)
-      : bounds_changed_callback_(callback) {}
-  virtual ~DetailsContainerView() {}
-
-  // views::View implementation.
-  virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE {
-    bounds_changed_callback_.Run();
-  }
-
- private:
-  base::Closure bounds_changed_callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(DetailsContainerView);
-};
-
 // A view that propagates visibility and preferred size changes.
 class LayoutPropagationView : public views::View {
  public:
   LayoutPropagationView() {}
   virtual ~LayoutPropagationView() {}
 
  protected:
   virtual void ChildVisibilityChanged(views::View* child) OVERRIDE {
     PreferredSizeChanged();
   }
@@ skipping 789 matching lines @@
   if (button_state == views::Button::STATE_PRESSED)
     return IDR_AUTOFILL_DIALOG_MENU_BUTTON_P;
   else if (button_state == views::Button::STATE_HOVERED)
     return IDR_AUTOFILL_DIALOG_MENU_BUTTON_H;
   else if (button_state == views::Button::STATE_DISABLED)
     return IDR_AUTOFILL_DIALOG_MENU_BUTTON_D;
   DCHECK_EQ(views::Button::STATE_NORMAL, button_state);
   return IDR_AUTOFILL_DIALOG_MENU_BUTTON;
 }
 
+// AutofillDialogViews::DetailsContainerView -----------------------------------
+
+AutofillDialogViews::DetailsContainerView::DetailsContainerView(
+    const base::Closure& callback)
+    : bounds_changed_callback_(callback),
+      ignore_layouts_(false) {}
+
+AutofillDialogViews::DetailsContainerView::~DetailsContainerView() {}
+
+void AutofillDialogViews::DetailsContainerView::OnBoundsChanged(
+    const gfx::Rect& previous_bounds) {
+  bounds_changed_callback_.Run();
+}
+
+void AutofillDialogViews::DetailsContainerView::Layout() {
+  if (!ignore_layouts_)
+    views::View::Layout();
+}
+
 // AutofillDialogViews::SuggestionView -----------------------------------------
 
 AutofillDialogViews::SuggestionView::SuggestionView(
     AutofillDialogViews* autofill_dialog)
     : label_(new views::Label()),
       label_line_2_(new views::Label()),
       icon_(new views::ImageView()),
       decorated_(
           new DecoratedTextfield(base::string16(),
                                  base::string16(),
@@ skipping 471 matching lines @@
   int notification_height = notification_area_->GetHeightForWidth(width);
   notification_area_->SetBounds(x, y, width, notification_height);
 
   // The rest (the |scrollable_area_|) takes up whatever's left.
   if (scrollable_area_->visible()) {
     int scroll_y = y;
     if (notification_height > 0)
       scroll_y += notification_height + views::kRelatedControlVerticalSpacing;
 
     int scroll_bottom = content_bounds.bottom();
-    scrollable_area_->contents()->SizeToPreferredSize();
+    DCHECK_EQ(scrollable_area_->contents(), details_container_);
+    details_container_->SizeToPreferredSize();
+    // TODO(estade): remove this hack. See crbug.com/285996
+    details_container_->set_ignore_layouts(true);
     scrollable_area_->SetBounds(x, scroll_y, width, scroll_bottom - scroll_y);
+    details_container_->set_ignore_layouts(false);
   }
 
   if (loading_shield_->visible())
     loading_shield_->SetBoundsRect(bounds());
 
   if (error_bubble_)
     error_bubble_->UpdatePosition();
 }
 
 void AutofillDialogViews::OnBoundsChanged(const gfx::Rect& previous_bounds) {
@@ skipping 775 matching lines @@
 AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
     : section(section),
       container(NULL),
       manual_input(NULL),
       suggested_info(NULL),
       suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill