Moved parent_->SchedulePaint() to Views::SetFillsBoundsOpaquely() and Views::SchedulePaint().

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/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
@@ skipping 3574 matching lines @@
     widget_->GetRootView()->SetBounds(0, 0, 200, 200);
   }
 
   void TearDown() override {
     widget_->CloseNow();
     ViewsTestBase::TearDown();
   }
 
   Widget* widget() { return widget_; }
 
+ protected:
+  // Accessors to View internals.
+  void SchedulePaintOnParent(View* view) { view->SchedulePaintOnParent(); }
+
  private:
   Widget* widget_;
 };
 
 
 TEST_F(ViewLayerTest, LayerToggling) {
   // Because we lazily create textures the calls to DrawTree are necessary to
   // ensure we trigger creation of textures.
   ui::Layer* root_layer = widget()->GetLayer();
   View* content_view = new View;
@@ skipping 372 matching lines @@
 
   // Make content_view have a dirty rect, paint the layers and make sure
   // PaintTrackingView is painted.
   content_view->layer()->SchedulePaint(gfx::Rect(0, 0, 10, 10));
   GetRootLayer()->GetCompositor()->ScheduleDraw();
   ui::DrawWaiterForTest::WaitForCompositingEnded(
       GetRootLayer()->GetCompositor());
   EXPECT_TRUE(content_view->painted());
 }
 
+TEST_F(ViewLayerTest, NoCrashWhenParentlessViewSchedulesPaintOnParent) {
+  TestView* v = new TestView;
+  SchedulePaintOnParent(v);
+}
+
+TEST_F(ViewLayerTest, ScheduledRectsInParentAfterSchedulingPaint) {
+  TestView* v1 = new TestView;
+  v1->SetBounds(10, 10, 100, 100);
+
+  TestView* v2 = new TestView;
+  v2->SetBounds(5, 6, 10, 20);
+  v1->AddChildView(v2);
+
+  v1->scheduled_paint_rects_.clear();
+  SchedulePaintOnParent(v2);
+  ASSERT_EQ(1U, v1->scheduled_paint_rects_.size());
+  EXPECT_EQ(gfx::Rect(5, 6, 10, 20), v1->scheduled_paint_rects_.front());
+}
+
+TEST_F(ViewLayerTest, ParentPaintWhenSwitchingPaintToLayerFromFalseToTrue) {
+  TestView* v1 = new TestView;
+  v1->SetBounds(10, 11, 12, 13);
+
+  TestView* v2 = new TestView;
+  v1->AddChildView(v2);
+
+  v1->scheduled_paint_rects_.clear();
+  v2->SetPaintToLayer(true);
+  EXPECT_EQ(1U, v1->scheduled_paint_rects_.size());
+}
+
+TEST_F(ViewLayerTest, NoParentPaintWhenSwitchingPaintToLayerFromTrueToTrue) {
+  TestView* v1 = new TestView;
+  v1->SetBounds(10, 11, 12, 13);
+
+  TestView* v2 = new TestView;
+  v2->SetPaintToLayer(true);
+  v1->AddChildView(v2);
+
+  v1->scheduled_paint_rects_.clear();
+  EXPECT_EQ(0U, v1->scheduled_paint_rects_.size());
+}
+
+TEST_F(ViewLayerTest,
+       ParentPaintWhenSwitchingFillBoundsOpaquelyFromTrueToFalse) {
+  TestView* v1 = new TestView;
+  v1->SetBounds(10, 11, 12, 13);
+
+  TestView* v2 = new TestView;
+  v2->SetPaintToLayer(true);
+  v2->SetFillsBoundsOpaquely(true);
+  v1->AddChildView(v2);
+
+  v1->scheduled_paint_rects_.clear();
+  v2->SetFillsBoundsOpaquely(false);
+  EXPECT_EQ(1U, v1->scheduled_paint_rects_.size());
+}
+
+TEST_F(ViewLayerTest,
+       ParentPaintWhenSwitchingFillBoundsOpaquelyFromFalseToTrue) {
+  TestView* v1 = new TestView;
+  v1->SetBounds(10, 11, 12, 13);
+
+  TestView* v2 = new TestView;
+  v2->SetPaintToLayer(true);
+  v2->SetFillsBoundsOpaquely(false);
+  v1->AddChildView(v2);
+
+  v1->scheduled_paint_rects_.clear();
+  v2->SetFillsBoundsOpaquely(true);
+  EXPECT_EQ(0U, v1->scheduled_paint_rects_.size());
+}
+
 // Tests that the visibility of child layers are updated correctly when a View's
 // visibility changes.
 TEST_F(ViewLayerTest, VisibilityChildLayers) {
   View* v1 = new View;
   v1->SetPaintToLayer(true);
   widget()->SetContentsView(v1);
 
   View* v2 = new View;
   v1->AddChildView(v2);
 
@@ skipping 348 matching lines @@
 
   // The View should continue receiving events after the |handler| is deleted.
   v->Reset();
   ui::MouseEvent released(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
                           ui::EventTimeForNow(), 0, 0);
   root->OnMouseReleased(released);
   EXPECT_EQ(ui::ET_MOUSE_RELEASED, v->last_mouse_event_type_);
 }
 
 }  // namespace views