Fix LayoutObject::SetSubtreeNeedsPaintPropertyUpdate() to set ancestor flags

third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp

 // Copyright 2015 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 "core/layout/LayoutObject.h"
 
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "platform/json/JSONValues.h"
@@ skipping 180 matching lines @@
   object->SetMayNeedPaintInvalidationSubtree();
   EXPECT_TRUE(object->MayNeedPaintInvalidationSubtree());
   object->SetMayNeedPaintInvalidationAnimatedBackgroundImage();
   EXPECT_TRUE(object->MayNeedPaintInvalidationAnimatedBackgroundImage());
   object->SetShouldInvalidateSelection();
   EXPECT_TRUE(object->ShouldInvalidateSelection());
   object->SetBackgroundChangedSinceLastPaintInvalidation();
   EXPECT_TRUE(object->BackgroundChangedSinceLastPaintInvalidation());
   object->SetNeedsPaintPropertyUpdate();
   EXPECT_TRUE(object->NeedsPaintPropertyUpdate());
+  EXPECT_TRUE(object->Parent()->DescendantNeedsPaintPropertyUpdate());
   object->bitfields_.SetDescendantNeedsPaintPropertyUpdate(true);
   EXPECT_TRUE(object->DescendantNeedsPaintPropertyUpdate());
 
-  ScopedSlimmingPaintV2ForTest enable_s_pv2(true);
+  ScopedSlimmingPaintInvalidationForTest enable_sp_invalidation(true);
   GetDocument().Lifecycle().AdvanceTo(DocumentLifecycle::kInPrePaint);
   object->GetMutableForPainting().ClearPaintFlags();
 
   EXPECT_FALSE(object->ShouldDoFullPaintInvalidation());
   EXPECT_FALSE(object->MayNeedPaintInvalidation());
   EXPECT_FALSE(object->MayNeedPaintInvalidationSubtree());
   EXPECT_FALSE(object->MayNeedPaintInvalidationAnimatedBackgroundImage());
   EXPECT_FALSE(object->ShouldInvalidateSelection());
   EXPECT_FALSE(object->BackgroundChangedSinceLastPaintInvalidation());
   EXPECT_FALSE(object->NeedsPaintPropertyUpdate());
   EXPECT_FALSE(object->DescendantNeedsPaintPropertyUpdate());
 }
 
+TEST_F(LayoutObjectTest, SubtreeNeedsPaintPropertyUpdate) {
+  LayoutObject* object = GetDocument().body()->GetLayoutObject();
+  object->SetSubtreeNeedsPaintPropertyUpdate();
+  EXPECT_TRUE(object->SubtreeNeedsPaintPropertyUpdate());
+  EXPECT_TRUE(object->NeedsPaintPropertyUpdate());
+  EXPECT_TRUE(object->Parent()->DescendantNeedsPaintPropertyUpdate());
+
+  ScopedSlimmingPaintInvalidationForTest enable_sp_invalidation(true);
+  GetDocument().Lifecycle().AdvanceTo(DocumentLifecycle::kInPrePaint);
+  object->GetMutableForPainting().ClearPaintFlags();
+
+  EXPECT_FALSE(object->SubtreeNeedsPaintPropertyUpdate());
+  EXPECT_FALSE(object->NeedsPaintPropertyUpdate());
+}
+
 TEST_F(LayoutObjectTest, NeedsPaintOffsetAndVisualRectUpdate) {
   LayoutObject* object = GetDocument().body()->GetLayoutObject();
   LayoutObject* parent = object->Parent();
 
   object->SetShouldDoFullPaintInvalidation();
   EXPECT_TRUE(object->ShouldDoFullPaintInvalidation());
   EXPECT_TRUE(object->NeedsPaintOffsetAndVisualRectUpdate());
   EXPECT_TRUE(parent->MayNeedPaintInvalidation());
   EXPECT_TRUE(parent->NeedsPaintOffsetAndVisualRectUpdate());
   object->ClearPaintInvalidationFlags();
@@ skipping 40 matching lines @@
   EXPECT_TRUE(parent->NeedsPaintOffsetAndVisualRectUpdate());
   object->ClearPaintInvalidationFlags();
   EXPECT_FALSE(object->MayNeedPaintInvalidation());
   EXPECT_FALSE(object->NeedsPaintOffsetAndVisualRectUpdate());
   parent->ClearPaintInvalidationFlags();
   EXPECT_FALSE(parent->MayNeedPaintInvalidation());
   EXPECT_FALSE(parent->NeedsPaintOffsetAndVisualRectUpdate());
 }
 
 }  // namespace blink