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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
  * All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 95 matching lines @@
   const LayoutRect& frameRect() const {
     ASSERT(isPlaced());
     return m_frameRect;
   }
 
 #if DCHECK_IS_ON()
   bool isInPlacedTree() const { return m_isInPlacedTree; }
   void setIsInPlacedTree(bool value) { m_isInPlacedTree = value; }
 #endif
 
-  bool shouldPaint() const { return m_shouldPaint; }
+  bool shouldPaint() const;
   void setShouldPaint(bool shouldPaint) { m_shouldPaint = shouldPaint; }
   bool isDescendant() const { return m_isDescendant; }
   void setIsDescendant(bool isDescendant) { m_isDescendant = isDescendant; }
   bool isLowestNonOverhangingFloatInChild() const {
     return m_isLowestNonOverhangingFloatInChild;
   }
   void setIsLowestNonOverhangingFloatInChild(
       bool isLowestNonOverhangingFloatInChild) {
     m_isLowestNonOverhangingFloatInChild = isLowestNonOverhangingFloatInChild;
   }
 
   // FIXME: Callers of these methods are dangerous and should be whitelisted
   // explicitly or removed.
   RootInlineBox* originatingLine() const { return m_originatingLine; }
   void setOriginatingLine(RootInlineBox* line) { m_originatingLine = line; }
 
  private:
   explicit FloatingObject(LayoutBox*);
   FloatingObject(LayoutBox*,
                  Type,
                  const LayoutRect&,
                  bool shouldPaint,
                  bool isDescendant,
                  bool isLowestNonOverhangingFloatInChild);
 
+  bool shouldPaintForCompositedLayoutPart();
+
   LayoutBox* m_layoutObject;
   RootInlineBox* m_originatingLine;
   LayoutRect m_frameRect;
 
   unsigned m_type : 2;  // Type (left or right aligned)
   unsigned m_shouldPaint : 1;
   unsigned m_isDescendant : 1;
   unsigned m_isPlaced : 1;
   unsigned m_isLowestNonOverhangingFloatInChild : 1;
 #if DCHECK_IS_ON()
@@ skipping 128 matching lines @@
 };
 template <>
 struct ValueToString<FloatingObject*> {
   static String toString(const FloatingObject*);
 };
 #endif
 
 }  // namespace blink
 
 #endif  // FloatingObjects_h