Revert of Fix shouldPaint issue when a composited floating iframe becomes non-self-painting

third_party/WebKit/Source/core/paint/PaintLayer.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 232 matching lines @@
   PaintLayer* removeChild(PaintLayer*);
 
   void removeOnlyThisLayerAfterStyleChange();
   void insertOnlyThisLayerAfterStyleChange();
 
   void styleDidChange(StyleDifference, const ComputedStyle* oldStyle);
 
   // FIXME: Many people call this function while it has out-of-date information.
   bool isSelfPaintingLayer() const { return m_isSelfPaintingLayer; }
 
+  // PaintLayers which represent LayoutParts may become self-painting due to
+  // being composited.  If this is the case, this method returns true.
+  bool isSelfPaintingOnlyBecauseIsCompositedPart() const;
+
   bool isTransparent() const {
     return layoutObject()->isTransparent() ||
            layoutObject()->style()->hasBlendMode() || layoutObject()->hasMask();
   }
 
   const PaintLayer* root() const {
     const PaintLayer* curr = this;
     while (curr->parent())
       curr = curr->parent();
     return curr;
@@ skipping 714 matching lines @@
       m_clipRectsCache = WTF::wrapUnique(new ClipRectsCache);
     return *m_clipRectsCache;
   }
   void clearClipRectsCache() const { m_clipRectsCache.reset(); }
 
   bool has3DTransformedDescendant() const {
     DCHECK(!m_needsDescendantDependentFlagsUpdate);
     return m_has3DTransformedDescendant;
   }
 
-  // Whether the value of isSelfPaintingLayer() changed since the last clearing
-  // (which happens after the flag is chedked during compositing update).
-  bool selfPaintingStatusChanged() const {
-    DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
-    return m_selfPaintingStatusChanged;
-  }
-  void clearSelfPaintingStatusChanged() {
-    DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
-    m_selfPaintingStatusChanged = false;
-  }
-
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
   void endShouldKeepAliveAllClientsRecursive();
 #endif
 
  private:
   void setNeedsCompositingInputsUpdateInternal();
 
   void update3DTransformedDescendantStatus();
 
   // Bounding box in the coordinates of this layer.
@@ skipping 107 matching lines @@
   }
 
   void mergeNeedsPaintPhaseFlagsFrom(const PaintLayer& layer) {
     m_needsPaintPhaseDescendantOutlines |=
         layer.m_needsPaintPhaseDescendantOutlines;
     m_needsPaintPhaseFloat |= layer.m_needsPaintPhaseFloat;
     m_needsPaintPhaseDescendantBlockBackgrounds |=
         layer.m_needsPaintPhaseDescendantBlockBackgrounds;
   }
 
+  bool isSelfPaintingLayerForIntrinsicOrScrollingReasons() const;
+
   bool shouldFragmentCompositedBounds(const PaintLayer* compositingLayer) const;
 
   void expandRectForStackingChildren(const PaintLayer& compositedLayer,
                                      LayoutRect& result,
                                      PaintLayer::CalculateBoundsOptions) const;
 
   // The return value is in the space of |stackingParent|, if non-null, or
   // |this| otherwise.
   LayoutRect boundingBoxForCompositingInternal(
       const PaintLayer& compositedLayer,
@@ skipping 62 matching lines @@
   unsigned m_needsPaintPhaseDescendantBlockBackgrounds : 1;
   unsigned m_previousPaintPhaseDescendantBlockBackgroundsWasEmpty : 1;
 
   // These bitfields are part of ancestor/descendant dependent compositing
   // inputs.
   unsigned m_hasDescendantWithClipPath : 1;
   unsigned m_hasNonIsolatedDescendantWithBlendMode : 1;
   unsigned m_hasAncestorWithClipPath : 1;
   unsigned m_hasRootScrollerAsDescendant : 1;
 
-  unsigned m_selfPaintingStatusChanged : 1;
-
   LayoutBoxModelObject* m_layoutObject;
 
   PaintLayer* m_parent;
   PaintLayer* m_previous;
   PaintLayer* m_next;
   PaintLayer* m_first;
   PaintLayer* m_last;
 
   // Our (x,y) coordinates are in our parent layer's coordinate space.
   LayoutPoint m_location;
@@ skipping 33 matching lines @@
 
 }  // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 CORE_EXPORT void showLayerTree(const blink::PaintLayer*);
 CORE_EXPORT void showLayerTree(const blink::LayoutObject*);
 #endif
 
 #endif  // Layer_h