Tweak PaintInvalidationReasons

third_party/WebKit/Source/platform/graphics/PaintInvalidationReason.h

Index: third_party/WebKit/Source/platform/graphics/PaintInvalidationReason.h
diff --git a/third_party/WebKit/Source/platform/graphics/PaintInvalidationReason.h b/third_party/WebKit/Source/platform/graphics/PaintInvalidationReason.h
index 8a39f4917b039b46987500162635f6788d60498f..42d41962958f9d973ade9412b5eb4eae7abc76bc 100644
--- a/third_party/WebKit/Source/platform/graphics/PaintInvalidationReason.h
+++ b/third_party/WebKit/Source/platform/graphics/PaintInvalidationReason.h
@@ -10,55 +10,49 @@
 
 namespace blink {
 
-enum PaintInvalidationReason {
-  kPaintInvalidationNone,
-  kPaintInvalidationIncremental,
-  kPaintInvalidationRectangle,
-  // The following reasons will all cause full invalidation of the LayoutObject.
-  kPaintInvalidationFull,  // Any unspecified reason of full invalidation.
-  kPaintInvalidationStyleChange,
-  kPaintInvalidationForcedByLayout,
-  kPaintInvalidationCompositingUpdate,
-  kPaintInvalidationBorderBoxChange,
-  kPaintInvalidationContentBoxChange,
-  kPaintInvalidationLayoutOverflowBoxChange,
-  kPaintInvalidationBoundsChange,
-  kPaintInvalidationLocationChange,
-  kPaintInvalidationBackgroundObscurationChange,
-  kPaintInvalidationBecameVisible,
-  kPaintInvalidationBecameInvisible,
-  kPaintInvalidationScroll,
-  kPaintInvalidationSelection,
-  kPaintInvalidationOutline,
-  kPaintInvalidationSubtree,
-  kPaintInvalidationLayoutObjectInsertion,
-  kPaintInvalidationLayoutObjectRemoval,
-  kPaintInvalidationSVGResourceChange,
-  kPaintInvalidationBackgroundOnScrollingContentsLayer,
-  kPaintInvalidationCaret,
-  kPaintInvalidationViewBackground,
-  kPaintInvalidationDocumentMarkerChange,
-  kPaintInvalidationForTesting,
-  // PaintInvalidationDelayedFull means that PaintInvalidationFull is needed in
-  // order to fully paint the content, but that painting of the object can be
-  // delayed until a future frame. This can be the case for an object whose
-  // content is not visible to the user.
-  kPaintInvalidationDelayedFull,
-
-  kPaintInvalidationReasonMax = kPaintInvalidationDelayedFull
+enum class PaintInvalidationReason : unsigned {
+  kNone,
+  kIncremental,
+  kRectangle,
+  // The following reasons will all cause full paint invalidation.
+  kFull,  // Any unspecified reason of full invalidation.
+  kStyle,
+  kGeometry,  // Layout or visual geometry change.
+  kCompositing,
+  kAppeared,
+  kDisappeared,
+  kScroll,
+  kScrollControl,  // scroll bars, scroll corner, etc.
+  kSelection,
+  kOutline,
+  kSubtree,
+  kSVGResource,
+  kBackground,
+  kBackgroundOnScrollingContentsLayer,
+  kCaret,
+  kDocumentMarker,
+  kImage,
+  kForTesting,
+  // kDelayedFull means that kFull is needed in order to fully paint the
+  // content, but that painting of the object can be delayed until a future
+  // frame. This can be the case for an object whose content is not visible to
+  // the user.
+  kDelayedFull,
+
+  kMax = kDelayedFull
 };
 
 PLATFORM_EXPORT const char* PaintInvalidationReasonToString(
     PaintInvalidationReason);
 
 inline bool IsFullPaintInvalidationReason(PaintInvalidationReason reason) {
-  return reason >= kPaintInvalidationFull;
+  return reason >= PaintInvalidationReason::kFull;
 }
 
 inline bool IsImmediateFullPaintInvalidationReason(
     PaintInvalidationReason reason) {
   return IsFullPaintInvalidationReason(reason) &&
-         reason != kPaintInvalidationDelayedFull;
+         reason != PaintInvalidationReason::kDelayedFull;
 }
 
 PLATFORM_EXPORT std::ostream& operator<<(std::ostream&,