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

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

Index: third_party/WebKit/Source/core/paint/PaintLayer.h
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.h b/third_party/WebKit/Source/core/paint/PaintLayer.h
index 75eb3c313e0786812a9dc768b5bb62af03821bcb..f57327cb49e3d2069ecee19945971cf364253502 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.h
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.h
@@ -250,6 +250,10 @@
   // 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();
@@ -982,17 +986,6 @@
   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
@@ -1122,6 +1115,8 @@
         layer.m_needsPaintPhaseDescendantBlockBackgrounds;
   }
 
+  bool isSelfPaintingLayerForIntrinsicOrScrollingReasons() const;
+
   bool shouldFragmentCompositedBounds(const PaintLayer* compositingLayer) const;
 
   void expandRectForStackingChildren(const PaintLayer& compositedLayer,
@@ -1204,8 +1199,6 @@
   unsigned m_hasAncestorWithClipPath : 1;
   unsigned m_hasRootScrollerAsDescendant : 1;
 
-  unsigned m_selfPaintingStatusChanged : 1;
-
   LayoutBoxModelObject* m_layoutObject;
 
   PaintLayer* m_parent;