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

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

Index: third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp b/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp
index 5fcadc5dc10003e774c206c595416f4854b8c3fa..0467cbb33419cd5da112d8e0a130753ed0503fe3 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObjectTest.cpp
@@ -182,7 +182,8 @@
   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();
@@ -203,6 +204,7 @@
   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());
@@ -212,63 +214,4 @@
   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