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

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

Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 89fd2d55ca862fd8b6f4e7e78161f177f9810990..da3c689eb279b90f9eaf8e78a50e8e219029dc6c 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -1646,12 +1646,12 @@
        styleRef().maskBoxImage().image()->data() == image) ||
       (styleRef().boxReflect() && styleRef().boxReflect()->mask().image() &&
        styleRef().boxReflect()->mask().image()->data() == image)) {
-    setShouldDoFullPaintInvalidationWithoutGeometryChange();
+    setShouldDoFullPaintInvalidation();
   } else {
     for (const FillLayer* layer = &styleRef().maskLayers(); layer;
          layer = layer->next()) {
       if (layer->image() && image == layer->image()->data()) {
-        setShouldDoFullPaintInvalidationWithoutGeometryChange();
+        setShouldDoFullPaintInvalidation();
         break;
       }
     }
@@ -1669,7 +1669,7 @@
         if (maybeAnimated) {
           setMayNeedPaintInvalidationAnimatedBackgroundImage();
         } else {
-          setShouldDoFullPaintInvalidationWithoutGeometryChange();
+          setShouldDoFullPaintInvalidation();
           setBackgroundChangedSinceLastPaintInvalidation();
         }
         break;
@@ -1750,10 +1750,8 @@
   LayoutBoxModelObject::ensureIsReadyForPaintInvalidation();
 
   if (mayNeedPaintInvalidationAnimatedBackgroundImage() &&
-      !backgroundIsKnownToBeObscured()) {
-    setShouldDoFullPaintInvalidationWithoutGeometryChange(
-        PaintInvalidationDelayedFull);
-  }
+      !backgroundIsKnownToBeObscured())
+    setShouldDoFullPaintInvalidation(PaintInvalidationDelayedFull);
 
   if (fullPaintInvalidationReason() != PaintInvalidationDelayedFull ||
       !intersectsVisibleViewport())
@@ -1765,8 +1763,7 @@
     // Conservatively assume the delayed paint invalidation was caused by
     // background image change.
     setBackgroundChangedSinceLastPaintInvalidation();
-    setShouldDoFullPaintInvalidationWithoutGeometryChange(
-        PaintInvalidationFull);
+    setShouldDoFullPaintInvalidation(PaintInvalidationFull);
   }
 }