Tweak PaintInvalidationReasons

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

 // Copyright 2016 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/HTMLNames.h"
 #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"
@@ skipping 60 matching lines @@
 
 TEST_P(BoxPaintInvalidatorTest, IncrementalInvalidationExpand) {
   GetDocument().View()->SetTracksPaintInvalidations(true);
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::styleAttr, "width: 100px; height: 200px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto& raster_invalidations =
       GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations.size());
   EXPECT_EQ(IntRect(60, 0, 60, 240), raster_invalidations[0].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            raster_invalidations[0].reason);
   EXPECT_EQ(IntRect(0, 120, 120, 120), raster_invalidations[1].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            raster_invalidations[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, IncrementalInvalidationShrink) {
   GetDocument().View()->SetTracksPaintInvalidations(true);
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::styleAttr, "width: 20px; height: 80px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto& raster_invalidations =
       GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations.size());
   EXPECT_EQ(IntRect(30, 0, 40, 140), raster_invalidations[0].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            raster_invalidations[0].reason);
   EXPECT_EQ(IntRect(0, 100, 70, 40), raster_invalidations[1].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            raster_invalidations[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, IncrementalInvalidationMixed) {
   GetDocument().View()->SetTracksPaintInvalidations(true);
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::styleAttr, "width: 100px; height: 80px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto& raster_invalidations =
       GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations.size());
   EXPECT_EQ(IntRect(60, 0, 60, 120), raster_invalidations[0].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            raster_invalidations[0].reason);
   EXPECT_EQ(IntRect(0, 100, 70, 40), raster_invalidations[1].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            raster_invalidations[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, SubpixelVisualRectChagne) {
   ScopedSlimmingPaintInvalidationForTest scoped_slimming_paint_invalidation(
       true);
 
   Element* target = GetDocument().getElementById("target");
 
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr, "width: 100.6px; height: 70.3px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto* raster_invalidations =
       &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(IntRect(60, 0, 61, 111), (*raster_invalidations)[0].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, (*raster_invalidations)[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            (*raster_invalidations)[0].reason);
   EXPECT_EQ(IntRect(0, 90, 70, 50), (*raster_invalidations)[1].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, (*raster_invalidations)[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            (*raster_invalidations)[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr, "width: 50px; height: 100px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   raster_invalidations = &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(IntRect(60, 0, 61, 111), (*raster_invalidations)[0].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, (*raster_invalidations)[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            (*raster_invalidations)[0].reason);
   EXPECT_EQ(IntRect(0, 90, 70, 50), (*raster_invalidations)[1].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, (*raster_invalidations)[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            (*raster_invalidations)[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, SubpixelVisualRectChangeWithTransform) {
   ScopedSlimmingPaintInvalidationForTest scoped_slimming_paint_invalidation(
       true);
 
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::classAttr, "border transform");
   GetDocument().View()->UpdateAllLifecyclePhases();
 
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr, "width: 100.6px; height: 70.3px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto* raster_invalidations =
       &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(IntRect(0, 0, 140, 280), (*raster_invalidations)[0].rect);
-  EXPECT_EQ(kPaintInvalidationBorderBoxChange,
+  EXPECT_EQ(PaintInvalidationReason::kGeometry,
             (*raster_invalidations)[0].reason);
   EXPECT_EQ(IntRect(0, 0, 242, 222), (*raster_invalidations)[1].rect);
-  EXPECT_EQ(kPaintInvalidationBorderBoxChange,
+  EXPECT_EQ(PaintInvalidationReason::kGeometry,
             (*raster_invalidations)[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr, "width: 50px; height: 100px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   raster_invalidations = &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(IntRect(0, 0, 242, 222), (*raster_invalidations)[0].rect);
-  EXPECT_EQ(kPaintInvalidationBorderBoxChange,
+  EXPECT_EQ(PaintInvalidationReason::kGeometry,
             (*raster_invalidations)[0].reason);
   EXPECT_EQ(IntRect(0, 0, 140, 280), (*raster_invalidations)[1].rect);
-  EXPECT_EQ(kPaintInvalidationBorderBoxChange,
+  EXPECT_EQ(PaintInvalidationReason::kGeometry,
             (*raster_invalidations)[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, SubpixelWithinPixelsChange) {
   ScopedSlimmingPaintInvalidationForTest scoped_slimming_paint_invalidation(
       true);
 
   Element* target = GetDocument().getElementById("target");
   LayoutObject* target_object = target->GetLayoutObject();
   EXPECT_EQ(LayoutRect(0, 0, 70, 140), target_object->VisualRect());
 
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr,
                        "margin-top: 0.6px; width: 50px; height: 99.3px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   EXPECT_EQ(LayoutRect(LayoutUnit(), LayoutUnit(0.6), LayoutUnit(70),
                        LayoutUnit(139.3)),
             target_object->VisualRect());
   const auto* raster_invalidations =
       &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations->size());
   EXPECT_EQ(IntRect(0, 0, 70, 140), (*raster_invalidations)[0].rect);
-  EXPECT_EQ(kPaintInvalidationBoundsChange, (*raster_invalidations)[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kGeometry,
+            (*raster_invalidations)[0].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr,
                        "margin-top: 0.6px; width: 49.3px; height: 98.5px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   EXPECT_EQ(LayoutRect(LayoutUnit(), LayoutUnit(0.6), LayoutUnit(69.3),
                        LayoutUnit(138.5)),
             target_object->VisualRect());
   raster_invalidations = &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(IntRect(59, 0, 11, 140), (*raster_invalidations)[0].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, (*raster_invalidations)[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            (*raster_invalidations)[0].reason);
   EXPECT_EQ(IntRect(0, 119, 70, 21), (*raster_invalidations)[1].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, (*raster_invalidations)[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            (*raster_invalidations)[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, ResizeRotated) {
   ScopedSlimmingPaintInvalidationForTest scoped_slimming_paint_invalidation(
       true);
 
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::styleAttr, "transform: rotate(45deg)");
   GetDocument().View()->UpdateAllLifecyclePhases();
 
   // Should do full invalidation a rotated object is resized.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr,
                        "transform: rotate(45deg); width: 200px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto* raster_invalidations =
       &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations->size());
   EXPECT_EQ(IntRect(-99, 0, 255, 255), (*raster_invalidations)[0].rect);
-  EXPECT_EQ(kPaintInvalidationBorderBoxChange,
+  EXPECT_EQ(PaintInvalidationReason::kGeometry,
             (*raster_invalidations)[0].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, ResizeRotatedChild) {
   ScopedSlimmingPaintInvalidationForTest scoped_slimming_paint_invalidation(
       true);
 
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::styleAttr,
                        "transform: rotate(45deg); width: 200px");
   target->setInnerHTML(
       "<div id=child style='width: 50px; height: 50px; background: "
       "red'></div>");
   GetDocument().View()->UpdateAllLifecyclePhases();
   Element* child = GetDocument().getElementById("child");
 
   // Should do full invalidation a rotated object is resized.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   child->setAttribute(HTMLNames::styleAttr,
                       "width: 100px; height: 50px; background: red");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto* raster_invalidations =
       &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations->size());
   EXPECT_EQ(IntRect(-43, 21, 107, 107), (*raster_invalidations)[0].rect);
-  EXPECT_EQ(kPaintInvalidationBorderBoxChange,
+  EXPECT_EQ(PaintInvalidationReason::kGeometry,
             (*raster_invalidations)[0].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, CompositedLayoutViewResize) {
   EnableCompositing();
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::classAttr, "");
   target->setAttribute(HTMLNames::styleAttr, "height: 2000px");
   GetDocument().View()->UpdateAllLifecyclePhases();
 
   // Resize the content.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr, "height: 3000px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto& raster_invalidations =
       GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations.size());
   EXPECT_EQ(IntRect(0, 2000, 800, 1000), raster_invalidations[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(&GetLayoutView()),
             raster_invalidations[0].client);
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-    EXPECT_EQ(kPaintInvalidationBackgroundOnScrollingContentsLayer,
+    EXPECT_EQ(PaintInvalidationReason::kBackgroundOnScrollingContentsLayer,
               raster_invalidations[0].reason);
   } else {
-    EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[0].reason);
+    EXPECT_EQ(PaintInvalidationReason::kIncremental,
+              raster_invalidations[0].reason);
   }
 
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   // Resize the viewport. No paint invalidation.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   GetDocument().View()->Resize(800, 1000);
   GetDocument().View()->UpdateAllLifecyclePhases();
   EXPECT_FALSE(GetRasterInvalidationTracking());
   GetDocument().View()->SetTracksPaintInvalidations(false);
@@ skipping 12 matching lines @@
   target->setAttribute(HTMLNames::styleAttr, "height: 3000px");
   GetDocument().View()->UpdateAllLifecyclePhases();
 
   const auto& raster_invalidations =
       GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations.size());
   EXPECT_EQ(IntRect(0, 0, 800, 3000), raster_invalidations[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(&GetLayoutView()),
             raster_invalidations[0].client);
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
-    EXPECT_EQ(kPaintInvalidationBackgroundOnScrollingContentsLayer,
+    EXPECT_EQ(PaintInvalidationReason::kBackgroundOnScrollingContentsLayer,
               raster_invalidations[0].reason);
   } else {
-    EXPECT_EQ(kPaintInvalidationLayoutOverflowBoxChange,
+    EXPECT_EQ(PaintInvalidationReason::kBackground,
               raster_invalidations[0].reason);
   }
 
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   // Resize the viewport. No paint invalidation.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   GetDocument().View()->Resize(800, 1000);
   GetDocument().View()->UpdateAllLifecyclePhases();
   EXPECT_FALSE(GetRasterInvalidationTracking());
@@ skipping 30 matching lines @@
   // Resize the iframe.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   iframe->setAttribute(HTMLNames::styleAttr, "height: 200px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto& raster_invalidations =
       GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations.size());
   EXPECT_EQ(IntRect(0, 100, 100, 100), raster_invalidations[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(iframe->GetLayoutObject()),
             raster_invalidations[0].client);
-  EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            raster_invalidations[0].reason);
   EXPECT_EQ(
       static_cast<const DisplayItemClient*>(content->GetLayoutObject()->View()),
       raster_invalidations[1].client);
   EXPECT_EQ(IntRect(0, 100, 100, 100), raster_invalidations[1].rect);
-  EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            raster_invalidations[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, NonCompositedLayoutViewGradientResize) {
   SetBodyInnerHTML(
       "<style>"
       "  body { margin: 0 }"
       "  iframe { display: block; width: 100px; height: 100px; border: none; }"
       "</style>"
       "<iframe id='iframe'></iframe>");
@@ skipping 17 matching lines @@
   // Resize the content.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   content->setAttribute(HTMLNames::styleAttr, "height: 500px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto* raster_invalidations =
       &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations->size());
   EXPECT_EQ(IntRect(0, 0, 100, 100), (*raster_invalidations)[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(frame_layout_view),
             (*raster_invalidations)[0].client);
-  EXPECT_EQ(kPaintInvalidationLayoutOverflowBoxChange,
+  EXPECT_EQ(PaintInvalidationReason::kBackground,
             (*raster_invalidations)[0].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   // Resize the iframe.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   iframe->setAttribute(HTMLNames::styleAttr, "height: 200px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   raster_invalidations = &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(IntRect(0, 100, 100, 100), (*raster_invalidations)[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(iframe->GetLayoutObject()),
             (*raster_invalidations)[0].client);
-  EXPECT_EQ(kPaintInvalidationIncremental, (*raster_invalidations)[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            (*raster_invalidations)[0].reason);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(frame_layout_view),
             (*raster_invalidations)[1].client);
   EXPECT_EQ(IntRect(0, 0, 100, 200), (*raster_invalidations)[1].rect);
-  EXPECT_EQ(kPaintInvalidationViewBackground,
+  EXPECT_EQ(PaintInvalidationReason::kBackground,
             (*raster_invalidations)[1].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, CompositedBackgroundAttachmentLocalResize) {
   EnableCompositing();
 
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::classAttr, "border local-background");
   target->setAttribute(HTMLNames::styleAttr, "will-change: transform");
@@ skipping 14 matching lines @@
   GraphicsLayer* contents_layer = target_obj->Layer()->GraphicsLayerBacking();
   // No invalidation on the container layer.
   EXPECT_FALSE(container_layer->GetRasterInvalidationTracking());
   // Incremental invalidation of background on contents layer.
   const auto& contents_raster_invalidations =
       contents_layer->GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, contents_raster_invalidations.size());
   EXPECT_EQ(IntRect(0, 500, 500, 500), contents_raster_invalidations[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(target->GetLayoutObject()),
             contents_raster_invalidations[0].client);
-  EXPECT_EQ(kPaintInvalidationBackgroundOnScrollingContentsLayer,
+  EXPECT_EQ(PaintInvalidationReason::kBackgroundOnScrollingContentsLayer,
             contents_raster_invalidations[0].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   // Resize the container.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr,
                        "will-change: transform; height: 200px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   // No invalidation on the contents layer.
   EXPECT_FALSE(contents_layer->GetRasterInvalidationTracking());
   // Incremental invalidation on the container layer.
   const auto& container_raster_invalidations =
       container_layer->GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, container_raster_invalidations.size());
   EXPECT_EQ(IntRect(0, 120, 70, 120), container_raster_invalidations[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(target->GetLayoutObject()),
             container_raster_invalidations[0].client);
-  EXPECT_EQ(kPaintInvalidationIncremental,
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
             container_raster_invalidations[0].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest,
        CompositedBackgroundAttachmentLocalGradientResize) {
   EnableCompositing();
 
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::classAttr,
@@ skipping 17 matching lines @@
   // No invalidation on the container layer.
   EXPECT_FALSE(container_layer->GetRasterInvalidationTracking());
   // Full invalidation of background on contents layer because the gradient
   // background is resized.
   const auto& contents_raster_invalidations =
       contents_layer->GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, contents_raster_invalidations.size());
   EXPECT_EQ(IntRect(0, 0, 500, 1000), contents_raster_invalidations[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(target->GetLayoutObject()),
             contents_raster_invalidations[0].client);
-  EXPECT_EQ(kPaintInvalidationBackgroundOnScrollingContentsLayer,
+  EXPECT_EQ(PaintInvalidationReason::kBackgroundOnScrollingContentsLayer,
             contents_raster_invalidations[0].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   // Resize the container.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr,
                        "will-change: transform; height: 200px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   EXPECT_FALSE(contents_layer->GetRasterInvalidationTracking());
   // Full invalidation on the container layer.
   const auto& container_raster_invalidations =
       container_layer->GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, container_raster_invalidations.size());
   EXPECT_EQ(IntRect(0, 0, 70, 240), container_raster_invalidations[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(target->GetLayoutObject()),
             container_raster_invalidations[0].client);
-  EXPECT_EQ(kPaintInvalidationBorderBoxChange,
+  EXPECT_EQ(PaintInvalidationReason::kGeometry,
             container_raster_invalidations[0].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_P(BoxPaintInvalidatorTest, NonCompositedBackgroundAttachmentLocalResize) {
   Element* target = GetDocument().getElementById("target");
   target->setAttribute(HTMLNames::classAttr, "border local-background");
   target->setInnerHTML(
       "<div id=child style='width: 500px; height: 500px'></div>",
       ASSERT_NO_EXCEPTION);
@@ skipping 12 matching lines @@
   // Resize the container.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   target->setAttribute(HTMLNames::styleAttr, "height: 200px");
   GetDocument().View()->UpdateAllLifecyclePhases();
   const auto& raster_invalidations =
       GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations.size());
   EXPECT_EQ(IntRect(0, 120, 70, 120), raster_invalidations[0].rect);
   EXPECT_EQ(static_cast<const DisplayItemClient*>(target->GetLayoutObject()),
             raster_invalidations[0].client);
-  EXPECT_EQ(kPaintInvalidationIncremental, raster_invalidations[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kIncremental,
+            raster_invalidations[0].reason);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 }  // namespace blink