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

ui/views/view_unittest.cc

Index: ui/views/view_unittest.cc
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 503eead6f6853e79ada14751076bb4c698695a82..6733703745cbf7d86261138f123bc889f7820245 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -3592,6 +3592,10 @@ class ViewLayerTest : public ViewsTestBase {
 
   Widget* widget() { return widget_; }
 
+ protected:
+  // Accessors to View internals.
+  void SchedulePaintOnParent(View* view) { view->SchedulePaintOnParent(); }
+
  private:
   Widget* widget_;
 };
@@ -3984,6 +3988,79 @@ TEST_F(ViewLayerTest, DontPaintChildrenWithLayers) {
   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) {