Tweak PaintInvalidationReasons

third_party/WebKit/Source/core/paint/PaintInvalidationTest.cpp

 // Copyright 2017 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.
 
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/paint/RasterInvalidationTracking.h"
@@ skipping 156 matching lines @@
 TEST_P(PaintInvalidationTest, DelayedFullPaintInvalidation) {
   EnableCompositing();
   SetBodyInnerHTML(
       "<style>body { margin: 0 }</style>"
       "<div style='height: 4000px'></div>"
       "<div id='target' style='width: 100px; height: 100px; background: blue'>"
       "</div>");
 
   auto* target = GetLayoutObjectByElementId("target");
   target->SetShouldDoFullPaintInvalidationWithoutGeometryChange(
-      kPaintInvalidationDelayedFull);
-  EXPECT_EQ(kPaintInvalidationDelayedFull,
+      PaintInvalidationReason::kDelayedFull);
+  EXPECT_EQ(PaintInvalidationReason::kDelayedFull,
             target->FullPaintInvalidationReason());
   EXPECT_FALSE(target->NeedsPaintOffsetAndVisualRectUpdate());
 
   GetDocument().View()->SetTracksPaintInvalidations(true);
   GetDocument().View()->UpdateAllLifecyclePhases();
   EXPECT_EQ(nullptr, GetRasterInvalidationTracking());
-  EXPECT_EQ(kPaintInvalidationDelayedFull,
+  EXPECT_EQ(PaintInvalidationReason::kDelayedFull,
             target->FullPaintInvalidationReason());
   EXPECT_FALSE(target->NeedsPaintOffsetAndVisualRectUpdate());
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   GetDocument().View()->SetTracksPaintInvalidations(true);
   // Scroll target into view.
   GetDocument().domWindow()->scrollTo(0, 4000);
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto& raster_invalidations =
       GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations.size());
-  EXPECT_EQ(kPaintInvalidationNone, target->FullPaintInvalidationReason());
+  EXPECT_EQ(PaintInvalidationReason::kNone,
+            target->FullPaintInvalidationReason());
   EXPECT_EQ(IntRect(0, 4000, 100, 100), raster_invalidations[0].rect);
-  EXPECT_EQ(kPaintInvalidationFull, raster_invalidations[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kFull, raster_invalidations[0].reason);
   EXPECT_FALSE(target->NeedsPaintOffsetAndVisualRectUpdate());
   GetDocument().View()->SetTracksPaintInvalidations(false);
 };
 
 }  // namespace
 
 }  // namespace blink