Move PaintResult enum out of PaintLayerPainter.h into PaintResult.h

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 33 matching lines @@
 
 #ifndef PaintLayer_h
 #define PaintLayer_h
 
 #include "core/CoreExport.h"
 #include "core/layout/ClipRectsCache.h"
 #include "core/layout/LayoutBox.h"
 #include "core/paint/PaintLayerClipper.h"
 #include "core/paint/PaintLayerFilterInfo.h"
 #include "core/paint/PaintLayerFragment.h"
-#include "core/paint/PaintLayerPainter.h"
 #include "core/paint/PaintLayerScrollableArea.h"
 #include "core/paint/PaintLayerStackingNode.h"
 #include "core/paint/PaintLayerStackingNodeIterator.h"
+#include "core/paint/PaintResult.h"
 #include "platform/graphics/CompositingReasons.h"
 #include "platform/graphics/SquashingDisallowedReasons.h"
 #include "wtf/Allocator.h"
 #include "wtf/AutoReset.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 class CompositedLayerMapping;
@@ skipping 832 matching lines @@
   }
   void setPreviousPaintingClipRects(ClipRects& clipRects) {
     m_previousPaintingClipRects = &clipRects;
   }
 
   LayoutRect previousPaintDirtyRect() const { return m_previousPaintDirtyRect; }
   void setPreviousPaintDirtyRect(const LayoutRect& rect) {
     m_previousPaintDirtyRect = rect;
   }
 
-  PaintLayerPainter::PaintResult previousPaintResult() const {
-    return static_cast<PaintLayerPainter::PaintResult>(m_previousPaintResult);
+  PaintResult previousPaintResult() const {
+    return static_cast<PaintResult>(m_previousPaintResult);
   }
-  void setPreviousPaintResult(PaintLayerPainter::PaintResult result) {
+  void setPreviousPaintResult(PaintResult result) {
     m_previousPaintResult = static_cast<unsigned>(result);
     DCHECK(m_previousPaintResult == static_cast<unsigned>(result));
   }
 
   // Used to skip PaintPhaseDescendantOutlinesOnly for layers that have never
   // had descendant outlines.  The flag is set during paint invalidation on a
   // self painting layer if any contained object has outline.  It's cleared
   // during painting if PaintPhaseDescendantOutlinesOnly painted nothing.
   // For more details, see core/paint/REAME.md#Empty paint phase optimization.
   bool needsPaintPhaseDescendantOutlines() const {
@@ skipping 231 matching lines @@
 
   // Should be for stacking contexts having unisolated blending descendants.
   unsigned m_shouldIsolateCompositedDescendants : 1;
 
   // True if this layout layer just lost its grouped mapping due to the
   // CompositedLayerMapping being destroyed, and we don't yet know to what
   // graphics layer this Layer will be assigned.
   unsigned m_lostGroupedMapping : 1;
 
   unsigned m_needsRepaint : 1;
-  unsigned m_previousPaintResult : 1;  // PaintLayerPainter::PaintResult
+  unsigned m_previousPaintResult : 1;  // PaintResult
+  static_assert(MaxPaintResult <= 2,
+                "Should update number of bits of m_previousPaintResult");
 
   unsigned m_needsPaintPhaseDescendantOutlines : 1;
   unsigned m_previousPaintPhaseDescendantOutlinesWasEmpty : 1;
   unsigned m_needsPaintPhaseFloat : 1;
   unsigned m_previousPaintPhaseFloatWasEmpty : 1;
   unsigned m_needsPaintPhaseDescendantBlockBackgrounds : 1;
   unsigned m_previousPaintPhaseDescendantBlockBackgroundsWasEmpty : 1;
 
   // These bitfields are part of ancestor/descendant dependent compositing
   // inputs.
@@ skipping 45 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