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

third_party/WebKit/Source/core/layout/LayoutObject.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc.
  *               All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1627 matching lines @@
   const LayoutPoint& paintOffset() const { return m_paintOffset; }
 
   PaintInvalidationReason fullPaintInvalidationReason() const {
     return m_bitfields.fullPaintInvalidationReason();
   }
   bool shouldDoFullPaintInvalidation() const {
     return m_bitfields.fullPaintInvalidationReason() != PaintInvalidationNone;
   }
   void setShouldDoFullPaintInvalidation(
       PaintInvalidationReason = PaintInvalidationFull);
-  void setShouldDoFullPaintInvalidationWithoutGeometryChange(
-      PaintInvalidationReason = PaintInvalidationFull);
   void clearShouldDoFullPaintInvalidation() {
     m_bitfields.setFullPaintInvalidationReason(PaintInvalidationNone);
   }
 
   void clearPaintInvalidationFlags();
 
   bool mayNeedPaintInvalidation() const {
     return m_bitfields.mayNeedPaintInvalidation();
   }
   void setMayNeedPaintInvalidation();
-  void setMayNeedPaintInvalidationWithoutGeometryChange();
 
   bool mayNeedPaintInvalidationSubtree() const {
     return m_bitfields.mayNeedPaintInvalidationSubtree();
   }
   void setMayNeedPaintInvalidationSubtree();
 
-  bool needsPaintOffsetAndVisualRectUpdate() const {
-    return m_bitfields.needsPaintOffsetAndVisualRectUpdate();
-  }
-
   bool mayNeedPaintInvalidationAnimatedBackgroundImage() const {
     return m_bitfields.mayNeedPaintInvalidationAnimatedBackgroundImage();
   }
   void setMayNeedPaintInvalidationAnimatedBackgroundImage();
 
   bool shouldInvalidateSelection() const {
     return m_bitfields.shouldInvalidateSelection();
   }
   void setShouldInvalidateSelection();
 
   bool shouldCheckForPaintInvalidationWithPaintInvalidationState(
       const PaintInvalidationState&) const;
 
   bool shouldCheckForPaintInvalidation() const {
-    return mayNeedPaintInvalidation() || shouldDoFullPaintInvalidation();
+    return mayNeedPaintInvalidation() || shouldDoFullPaintInvalidation() ||
+           shouldInvalidateSelection() ||
+           m_bitfields.childShouldCheckForPaintInvalidation();
   }
 
   virtual LayoutRect viewRect() const;
 
   // New version to replace the above old version.
   virtual PaintInvalidationReason invalidatePaintIfNeeded(
       const PaintInvalidatorContext&) const;
 
   // When this object is invalidated for paint, this method is called to
   // invalidate any DisplayItemClients owned by this object, including the
@@ skipping 316 matching lines @@
   // layerOffset is the offset of this layoutObject within the current layer
   // that should be used for each result.
   virtual void computeSelfHitTestRects(Vector<LayoutRect>&,
                                        const LayoutPoint& layerOffset) const {}
 
   void setVisualRect(const LayoutRect& rect) { m_visualRect = rect; }
 
 #if DCHECK_IS_ON()
   virtual bool paintInvalidationStateIsDirty() const {
     return backgroundChangedSinceLastPaintInvalidation() ||
-           shouldCheckForPaintInvalidation() || shouldInvalidateSelection() ||
-           needsPaintOffsetAndVisualRectUpdate();
+           shouldCheckForPaintInvalidation();
   }
 #endif
 
   // Called before paint invalidation.
   virtual void ensureIsReadyForPaintInvalidation() { DCHECK(!needsLayout()); }
 
   // This function walks the descendants of |this|, following a
   // layout ordering.
   //
   // The ordering is important for PaintInvalidationState, as it requires to be
@@ skipping 64 matching lines @@
 
   // Walk up the parent chain and find the first scrolling block to disable
   // scroll anchoring on.
   void setScrollAnchorDisablingStyleChangedOnAncestor();
 
   // FIXME: This should be 'markContaingBoxChainForOverflowRecalc when we make
   // LayoutBox recomputeOverflow-capable. crbug.com/437012 and crbug.com/434700.
   inline void markAncestorsForOverflowRecalcIfNeeded();
 
   inline void markAncestorsForPaintInvalidation();
-  inline void setNeedsPaintOffsetAndVisualRectUpdate();
 
   inline void invalidateContainerPreferredLogicalWidths();
 
   void invalidatePaintIncludingNonSelfPaintingLayerDescendantsInternal(
       const LayoutBoxModelObject& paintInvalidationContainer);
 
   LayoutObject* containerForAbsolutePosition(AncestorSkipInfo* = nullptr) const;
 
   const LayoutBoxModelObject* enclosingCompositedContainer() const;
 
@@ skipping 76 matching lines @@
     // of the memory constraints on layout objects.
     LayoutObjectBitfields(Node* node)
         : m_selfNeedsLayout(false),
           m_needsPositionedMovementLayout(false),
           m_normalChildNeedsLayout(false),
           m_posChildNeedsLayout(false),
           m_needsSimplifiedNormalFlowLayout(false),
           m_selfNeedsOverflowRecalcAfterStyleChange(false),
           m_childNeedsOverflowRecalcAfterStyleChange(false),
           m_preferredLogicalWidthsDirty(false),
+          m_childShouldCheckForPaintInvalidation(false),
           m_mayNeedPaintInvalidation(false),
           m_mayNeedPaintInvalidationSubtree(false),
           m_mayNeedPaintInvalidationAnimatedBackgroundImage(false),
-          m_needsPaintOffsetAndVisualRectUpdate(false),
           m_shouldInvalidateSelection(false),
           m_floating(false),
           m_isAnonymous(!node),
           m_isText(false),
           m_isBox(false),
           m_isInline(true),
           m_isAtomicInlineLevel(false),
           m_horizontalWritingMode(true),
           m_hasLayer(false),
           m_hasOverflowClip(false),
@@ skipping 78 matching lines @@
     ADD_BOOLEAN_BITFIELD(childNeedsOverflowRecalcAfterStyleChange,
                          ChildNeedsOverflowRecalcAfterStyleChange);
 
     // This boolean marks preferred logical widths for lazy recomputation.
     //
     // See INTRINSIC SIZES / PREFERRED LOGICAL WIDTHS above about those
     // widths.
     ADD_BOOLEAN_BITFIELD(preferredLogicalWidthsDirty,
                          PreferredLogicalWidthsDirty);
 
+    ADD_BOOLEAN_BITFIELD(childShouldCheckForPaintInvalidation,
+                         ChildShouldCheckForPaintInvalidation);
     ADD_BOOLEAN_BITFIELD(mayNeedPaintInvalidation, MayNeedPaintInvalidation);
     ADD_BOOLEAN_BITFIELD(mayNeedPaintInvalidationSubtree,
                          MayNeedPaintInvalidationSubtree);
     ADD_BOOLEAN_BITFIELD(mayNeedPaintInvalidationAnimatedBackgroundImage,
                          MayNeedPaintInvalidationAnimatedBackgroundImage);
-    ADD_BOOLEAN_BITFIELD(needsPaintOffsetAndVisualRectUpdate,
-                         NeedsPaintOffsetAndVisualRectUpdate);
     ADD_BOOLEAN_BITFIELD(shouldInvalidateSelection, ShouldInvalidateSelection);
 
     // This boolean is the cached value of 'float'
     // (see ComputedStyle::isFloating).
     ADD_BOOLEAN_BITFIELD(floating, Floating);
 
     ADD_BOOLEAN_BITFIELD(isAnonymous, IsAnonymous);
     ADD_BOOLEAN_BITFIELD(isText, IsText);
     ADD_BOOLEAN_BITFIELD(isBox, IsBox);
 
@@ skipping 458 matching lines @@
 CORE_EXPORT void showLineTree(const blink::LayoutObject*);
 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1);
 // We don't make object2 an optional parameter so that showLayoutTree
 // can be called from gdb easily.
 CORE_EXPORT void showLayoutTree(const blink::LayoutObject* object1,
                                 const blink::LayoutObject* object2);
 
 #endif
 
 #endif  // LayoutObject_h