Fix views::View::BoundsChanged

ui/views/view_unittest.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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 184 matching lines @@
 
 namespace views {
 
 typedef ViewsTestBase ViewTest;
 
 // A derived class for testing purpose.
 class TestView : public View {
  public:
   TestView()
       : View(),
+        did_layout_(false),
         delete_on_pressed_(false),
         did_paint_(false),
         native_theme_(NULL),
         can_process_events_within_subtree_(true) {}
   ~TestView() override {}
 
   // Reset all test state
   void Reset() {
     did_change_bounds_ = false;
+    did_layout_ = false;
     last_mouse_event_type_ = 0;
     location_.SetPoint(0, 0);
     received_mouse_enter_ = false;
     received_mouse_exit_ = false;
     did_paint_ = false;
     accelerator_count_map_.clear();
     can_process_events_within_subtree_ = true;
   }
 
   // Exposed as public for testing.
   void DoFocus() {
     views::View::Focus();
   }
 
   void DoBlur() {
     views::View::Blur();
   }
 
   bool focusable() const { return View::focusable(); }
 
   void set_can_process_events_within_subtree(bool can_process) {
     can_process_events_within_subtree_ = can_process;
   }
 
   bool CanProcessEventsWithinSubtree() const override {
     return can_process_events_within_subtree_;
   }
 
+  void Layout() override;

[sky, 2015/11/18 16:55:50]

inline the implementation like the rest.

[flint, 2015/11/18 19:57:44]

Done.

+
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
   bool OnMouseDragged(const ui::MouseEvent& event) override;
   void OnMouseReleased(const ui::MouseEvent& event) override;
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
 
   void OnPaint(gfx::Canvas* canvas) override;
   void SchedulePaintInRect(const gfx::Rect& rect) override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
 
   void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
 
   // OnBoundsChanged.
   bool did_change_bounds_;
   gfx::Rect new_bounds_;
 
+  // Layout.
+  bool did_layout_;
+
   // MouseEvent.
   int last_mouse_event_type_;
   gfx::Point location_;
   bool received_mouse_enter_;
   bool received_mouse_exit_;
   bool delete_on_pressed_;
 
   // Painting.
   std::vector<gfx::Rect> scheduled_paint_rects_;
   bool did_paint_;
 
   // Accelerators.
   std::map<ui::Accelerator, int> accelerator_count_map_;
 
   // Native theme.
   const ui::NativeTheme* native_theme_;
 
   // Value to return from CanProcessEventsWithinSubtree().
   bool can_process_events_within_subtree_;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
+// Layout
+////////////////////////////////////////////////////////////////////////////////
+
+void TestView::Layout() {
+  did_layout_ = true;
+  View::Layout();
+}
+
+TEST_F(ViewTest, LayoutCalledAfterLayoutIsInvalidated) {

[sky, 2015/11/18 16:55:50]

Be more descriptive, eg LayoutCalledInvalidateAndOriginChanges

[flint, 2015/11/18 19:57:44]

Done.

+  TestView parent;
+  TestView* child = new TestView;
+  gfx::Rect parent_rect(0, 0, 100, 100);
+  parent.SetBoundsRect(parent_rect);
+
+  parent.Reset();
+  // |AddChildView| invalidates parent's layout.
+  parent.AddChildView(child);
+  // Change rect so that only rect's origin is affected.
+  parent.SetBoundsRect(parent_rect + gfx::Vector2d(10, 0));
+
+  EXPECT_TRUE(parent.did_layout_);
+
+  // After child layout is invalidated, parent and child must be laid out
+  // during parent->BoundsChanged(...) call.
+  parent.Reset();
+  child->Reset();
+
+  child->InvalidateLayout();
+  parent.SetBoundsRect(parent_rect + gfx::Vector2d(20, 0));
+  EXPECT_TRUE(parent.did_layout_);
+  EXPECT_TRUE(child->did_layout_);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // OnBoundsChanged
 ////////////////////////////////////////////////////////////////////////////////
 
 void TestView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   did_change_bounds_ = true;
   new_bounds_ = bounds();
 }
 
 TEST_F(ViewTest, OnBoundsChanged) {
   TestView v;
@@ skipping 3802 matching lines @@
   // notification.
   TestView* test_view_child_2 = new TestView();
   test_view->AddChildView(test_view_child_2);
   EXPECT_TRUE(test_view_child_2->native_theme_);
   EXPECT_EQ(widget->GetNativeTheme(), test_view_child_2->native_theme_);
 
   widget->CloseNow();
 }
 
 }  // namespace views