Revert of Add 'WithoutGeometryChange' variants of paint invalidation flag setters

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 164 matching lines @@
 
   skipInfo = LayoutObject::AncestorSkipInfo(container);
   EXPECT_EQ(container, floating->container(&skipInfo));
   EXPECT_FALSE(skipInfo.ancestorSkipped());
 }
 
 TEST_F(LayoutObjectTest, MutableForPaintingClearPaintFlags) {
   LayoutObject* object = document().body()->layoutObject();
   object->setShouldDoFullPaintInvalidation();
   EXPECT_TRUE(object->shouldDoFullPaintInvalidation());
-  EXPECT_TRUE(object->needsPaintOffsetAndVisualRectUpdate());
+  object->m_bitfields.setChildShouldCheckForPaintInvalidation(true);
+  EXPECT_TRUE(object->m_bitfields.childShouldCheckForPaintInvalidation());
   object->setMayNeedPaintInvalidation();
   EXPECT_TRUE(object->mayNeedPaintInvalidation());
   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());
   object->m_bitfields.setDescendantNeedsPaintPropertyUpdate(true);
   EXPECT_TRUE(object->descendantNeedsPaintPropertyUpdate());
 
   ScopedSlimmingPaintV2ForTest enableSPv2(true);
   document().lifecycle().advanceTo(DocumentLifecycle::InPrePaint);
   object->getMutableForPainting().clearPaintFlags();
 
   EXPECT_FALSE(object->shouldDoFullPaintInvalidation());
+  EXPECT_FALSE(object->m_bitfields.childShouldCheckForPaintInvalidation());
   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, NeedsPaintOffsetAndVisualRectUpdate) {
-  LayoutObject* object = document().body()->layoutObject();
-  LayoutObject* parent = object->parent();
-
-  object->setShouldDoFullPaintInvalidation();
-  EXPECT_TRUE(object->shouldDoFullPaintInvalidation());
-  EXPECT_TRUE(object->needsPaintOffsetAndVisualRectUpdate());
-  EXPECT_TRUE(parent->mayNeedPaintInvalidation());
-  EXPECT_TRUE(parent->needsPaintOffsetAndVisualRectUpdate());
-  object->clearPaintInvalidationFlags();
-  EXPECT_FALSE(object->shouldDoFullPaintInvalidation());
-  EXPECT_FALSE(object->needsPaintOffsetAndVisualRectUpdate());
-  parent->clearPaintInvalidationFlags();
-  EXPECT_FALSE(parent->mayNeedPaintInvalidation());
-  EXPECT_FALSE(parent->needsPaintOffsetAndVisualRectUpdate());
-
-  object->setMayNeedPaintInvalidation();
-  EXPECT_TRUE(object->mayNeedPaintInvalidation());
-  EXPECT_TRUE(object->needsPaintOffsetAndVisualRectUpdate());
-  EXPECT_TRUE(parent->mayNeedPaintInvalidation());
-  EXPECT_TRUE(parent->needsPaintOffsetAndVisualRectUpdate());
-  object->clearPaintInvalidationFlags();
-  EXPECT_FALSE(object->mayNeedPaintInvalidation());
-  EXPECT_FALSE(object->needsPaintOffsetAndVisualRectUpdate());
-  parent->clearPaintInvalidationFlags();
-  EXPECT_FALSE(parent->mayNeedPaintInvalidation());
-  EXPECT_FALSE(parent->needsPaintOffsetAndVisualRectUpdate());
-
-  object->setShouldDoFullPaintInvalidationWithoutGeometryChange();
-  EXPECT_TRUE(object->shouldDoFullPaintInvalidation());
-  EXPECT_FALSE(object->needsPaintOffsetAndVisualRectUpdate());
-  EXPECT_TRUE(parent->mayNeedPaintInvalidation());
-  EXPECT_FALSE(parent->needsPaintOffsetAndVisualRectUpdate());
-  object->setMayNeedPaintInvalidation();
-  EXPECT_TRUE(object->needsPaintOffsetAndVisualRectUpdate());
-  EXPECT_TRUE(parent->needsPaintOffsetAndVisualRectUpdate());
-  object->clearPaintInvalidationFlags();
-  EXPECT_FALSE(object->mayNeedPaintInvalidation());
-  EXPECT_FALSE(object->needsPaintOffsetAndVisualRectUpdate());
-  parent->clearPaintInvalidationFlags();
-  EXPECT_FALSE(parent->mayNeedPaintInvalidation());
-  EXPECT_FALSE(parent->needsPaintOffsetAndVisualRectUpdate());
-
-  object->setMayNeedPaintInvalidationWithoutGeometryChange();
-  EXPECT_TRUE(object->mayNeedPaintInvalidation());
-  EXPECT_FALSE(object->needsPaintOffsetAndVisualRectUpdate());
-  EXPECT_TRUE(parent->mayNeedPaintInvalidation());
-  EXPECT_FALSE(parent->needsPaintOffsetAndVisualRectUpdate());
-  object->setMayNeedPaintInvalidation();
-  EXPECT_TRUE(object->needsPaintOffsetAndVisualRectUpdate());
-  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