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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1628 matching lines @@
 
 void LayoutBox::imageChanged(WrappedImagePtr image, const IntRect*) {
   // TODO(chrishtr): support PaintInvalidationDelayedFull for animated border
   // images.
   if ((styleRef().borderImage().image() &&
        styleRef().borderImage().image()->data() == image) ||
       (styleRef().maskBoxImage().image() &&
        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;
       }
     }
   }
 
   if (!isDocumentElement() && !backgroundStolenForBeingBody()) {
     for (const FillLayer* layer = &styleRef().backgroundLayers(); layer;
          layer = layer->next()) {
       if (layer->image() && image == layer->image()->data()) {
         invalidateBackgroundObscurationStatus();
         bool maybeAnimated =
             layer->image()->cachedImage() &&
             layer->image()->cachedImage()->getImage() &&
             layer->image()->cachedImage()->getImage()->maybeAnimated();
         if (maybeAnimated) {
           setMayNeedPaintInvalidationAnimatedBackgroundImage();
         } else {
-          setShouldDoFullPaintInvalidationWithoutGeometryChange();
+          setShouldDoFullPaintInvalidation();
           setBackgroundChangedSinceLastPaintInvalidation();
         }
         break;
       }
     }
   }
 
   ShapeValue* shapeOutsideValue = style()->shapeOutside();
   if (!frameView()->isInPerformLayout() && isFloating() && shapeOutsideValue &&
       shapeOutsideValue->image() &&
@@ skipping 60 matching lines @@
             ->view();
   mapToVisualRectInAncestorSpace(layoutView, rect);
   return rect.intersects(LayoutRect(
       layoutView->frameView()->getScrollableArea()->visibleContentRect()));
 }
 
 void LayoutBox::ensureIsReadyForPaintInvalidation() {
   LayoutBoxModelObject::ensureIsReadyForPaintInvalidation();
 
   if (mayNeedPaintInvalidationAnimatedBackgroundImage() &&
-      !backgroundIsKnownToBeObscured()) {
-    setShouldDoFullPaintInvalidationWithoutGeometryChange(
-        PaintInvalidationDelayedFull);
-  }
+      !backgroundIsKnownToBeObscured())
+    setShouldDoFullPaintInvalidation(PaintInvalidationDelayedFull);
 
   if (fullPaintInvalidationReason() != PaintInvalidationDelayedFull ||
       !intersectsVisibleViewport())
     return;
 
   // Do regular full paint invalidation if the object with
   // PaintInvalidationDelayedFull is onscreen.
   if (intersectsVisibleViewport()) {
     // Conservatively assume the delayed paint invalidation was caused by
     // background image change.
     setBackgroundChangedSinceLastPaintInvalidation();
-    setShouldDoFullPaintInvalidationWithoutGeometryChange(
-        PaintInvalidationFull);
+    setShouldDoFullPaintInvalidation(PaintInvalidationFull);
   }
 }
 
 PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(
     const PaintInvalidationState& paintInvalidationState) {
   if (hasBoxDecorationBackground()
       // We also paint overflow controls in background phase.
       || (hasOverflowClip() && getScrollableArea()->hasOverflowControls())) {
     PaintLayer& layer = paintInvalidationState.paintingLayer();
     if (&layer.layoutObject() != this)
@@ skipping 3973 matching lines @@
 
 void LayoutBox::MutableForPainting::
     savePreviousContentBoxSizeAndLayoutOverflowRect() {
   auto& rareData = layoutBox().ensureRareData();
   rareData.m_hasPreviousContentBoxSizeAndLayoutOverflowRect = true;
   rareData.m_previousContentBoxSize = layoutBox().contentBoxRect().size();
   rareData.m_previousLayoutOverflowRect = layoutBox().layoutOverflowRect();
 }
 
 }  // namespace blink