Revert of Improve handling of PaintInvalidationLayer (renamed to PaintInvalidationSubtree)

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PaintInvalidationState_h
 #define PaintInvalidationState_h
 
 #include "core/CoreExport.h"
 #include "platform/geometry/LayoutRect.h"
-#include "platform/graphics/PaintInvalidationReason.h"
 #include "platform/transforms/AffineTransform.h"
 #include "wtf/Allocator.h"
 #include "wtf/Noncopyable.h"
 
 namespace blink {
 
 class LayoutBoxModelObject;
 class LayoutObject;
 class LayoutSVGModelObject;
 class LayoutView;
@@ skipping 24 matching lines @@
 
     // For root LayoutView, or when sub-frame LayoutView's invalidateTreeIfNeeded() is called directly from
     // FrameView::invalidateTreeIfNeededRecursive() instead of the owner LayoutPart.
     // TODO(wangxianzhu): Eliminate the latter case.
     PaintInvalidationState(const LayoutView&, Vector<LayoutObject*>& pendingDelayedPaintInvalidations);
 
     // When a PaintInvalidationState is constructed, it can be used to map points/rects in the object's
     // local space (border box space for LayoutBoxes). After invalidation of the current object,
     // before invalidation of the subtrees, this method must be called to apply clip and scroll offset
     // etc. for creating child PaintInvalidationStates.
-    void updateForChildren(PaintInvalidationReason);
+    void updateForChildren();
 
-    bool hasForcedSubtreeInvalidationFlags() const { return m_forcedSubtreeInvalidationFlags; }
+    bool forcedSubtreeInvalidationWithinContainer() const { return m_forcedSubtreeInvalidationWithinContainer; }
+    void setForceSubtreeInvalidationWithinContainer() { m_forcedSubtreeInvalidationWithinContainer = true; }
 
-    bool forcedSubtreeInvalidationCheckingWithinContainer() const { return m_forcedSubtreeInvalidationFlags & InvalidationChecking; }
-    void setForceSubtreeInvalidationCheckingWithinContainer() { m_forcedSubtreeInvalidationFlags |= InvalidationChecking; }
-
-    bool forcedSubtreeFullInvalidationWithinContainer() const { return m_forcedSubtreeInvalidationFlags & FullInvalidation; }
-
-    bool forcedSubtreeInvalidationRectUpdateWithinContainerOnly() const { return m_forcedSubtreeInvalidationFlags == InvalidationRectUpdate; }
-    void setForceSubtreeInvalidationRectUpdateWithinContainer() { m_forcedSubtreeInvalidationFlags |= InvalidationRectUpdate; }
+    bool forcedSubtreeInvalidationRectUpdateWithinContainer() const { return m_forcedSubtreeInvalidationRectUpdateWithinContainer; }
+    void setForceSubtreeInvalidationRectUpdateWithinContainer() { m_forcedSubtreeInvalidationRectUpdateWithinContainer = true; }
 
     const LayoutBoxModelObject& paintInvalidationContainer() const { return *m_paintInvalidationContainer; }
 
     // Computes the position of the current object ((0,0) in the space of the object)
     // in the space of paint invalidation backing.
     LayoutPoint computePositionFromPaintInvalidationBacking() const;
 
     // Returns the rect bounds needed to invalidate paint of this object,
     // in the space of paint invalidation backing.
     LayoutRect computePaintInvalidationRectInBacking() const;
@@ skipping 17 matching lines @@
 
     void updateForCurrentObject(const PaintInvalidationState& parentState);
     void updateForNormalChildren();
 
     LayoutRect computePaintInvalidationRectInBackingForSVG() const;
 
     void addClipRectRelativeToPaintOffset(const LayoutRect& localClipRect);
 
     const LayoutObject& m_currentObject;
 
-    enum ForcedSubtreeInvalidationFlag {
-        InvalidationChecking = 1 << 0,
-        InvalidationRectUpdate = 1 << 1,
-        FullInvalidation = 1 << 2,
-        FullInvalidationForStackedContents = 1 << 3,
-    };
-    unsigned m_forcedSubtreeInvalidationFlags;
+    bool m_forcedSubtreeInvalidationWithinContainer;
+    bool m_forcedSubtreeInvalidationRectUpdateWithinContainer;
 
     bool m_clipped;
     bool m_clippedForAbsolutePosition;
 
     // Clip rect from paintInvalidationContainer if m_cachedOffsetsEnabled is true.
     LayoutRect m_clipRect;
     LayoutRect m_clipRectForAbsolutePosition;
 
     // x/y offset from the paintInvalidationContainer if m_cachedOffsetsEnabled is true.
     // It includes relative positioning and scroll offsets.
@@ skipping 39 matching lines @@
 
 #ifdef CHECK_FAST_PATH_SLOW_PATH_EQUALITY
     void assertFastPathAndSlowPathRectsEqual(const LayoutRect& fastPathRect, const LayoutRect& slowPathRect) const;
     bool m_canCheckFastPathSlowPathEquality;
 #endif
 };
 
 } // namespace blink
 
 #endif // PaintInvalidationState_h