Make GeometryMapperOption enum class

Enumerator kUseGeometryMapper defined both in
src/third_party/blink/renderer/core/paint/paint_layer.h and
src/third_party/blink/renderer/core/layout/layout_object.h files which
causes a -Wshadow warning when both of these files are included

Bug: None
Change-Id: Iaabfb627c656d9a54db9a4f8249034696aa8dbbb
Reviewed-on: https://chromium-review.googlesource.com/c/1384284
Commit-Queue: Chris Harrelson <chrishtr@chromium.org>
Reviewed-by: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#618262}
diff --git a/third_party/blink/renderer/core/layout/layout_tree_as_text.cc b/third_party/blink/renderer/core/layout/layout_tree_as_text.cc
index 59f5a4e..d548b36 100644
--- a/third_party/blink/renderer/core/layout/layout_tree_as_text.cc
+++ b/third_party/blink/renderer/core/layout/layout_tree_as_text.cc
@@ -713,7 +713,7 @@
   LayoutRect layer_bounds;
   ClipRect damage_rect, clip_rect_to_apply;
   if (layer->GetLayoutObject().FirstFragment().HasLocalBorderBoxProperties()) {
-    layer->Clipper(PaintLayer::kUseGeometryMapper)
+    layer->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
         .CalculateRects(
             ClipRectsContext(root_layer,
                              &root_layer->GetLayoutObject().FirstFragment(),
@@ -721,7 +721,7 @@
             &layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds,
             damage_rect, clip_rect_to_apply);
   } else {
-    layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+    layer->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
         .CalculateRects(
             ClipRectsContext(root_layer, nullptr, kUncachedClipRects), nullptr,
             nullptr, layer_bounds, damage_rect, clip_rect_to_apply);
diff --git a/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc b/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc
index 80d3cb9..a50392a 100644
--- a/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc
+++ b/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping.cc
@@ -650,7 +650,8 @@
       kIgnoreOverflowClip);
 
   ClipRect clip_rect;
-  owning_layer_.Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  owning_layer_
+      .Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateBackgroundClipRect(clip_rects_context, clip_rect);
   if (clip_rect.Rect() == LayoutRect(LayoutRect::InfiniteIntRect()))
     return;
@@ -1375,7 +1376,8 @@
       kIgnorePlatformOverlayScrollbarSize, kIgnoreOverflowClipAndScroll);
 
   ClipRect clip_rect;
-  owning_layer_.Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  owning_layer_
+      .Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateBackgroundClipRect(clip_rects_context, clip_rect);
   // Scroll offset is not included in the clip rect returned above
   // (see kIgnoreOverflowClipAndScroll), so we need to add it in
@@ -3050,7 +3052,8 @@
       &ancestor_paint_info->paint_layer->GetLayoutObject().FirstFragment(),
       kUncachedClipRects);
   ClipRect parent_clip_rect;
-  paint_info.paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  paint_info.paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateBackgroundClipRect(clip_rects_context, parent_clip_rect);
 
   // Convert from ancestor to local coordinates.
diff --git a/third_party/blink/renderer/core/paint/compositing/compositing_inputs_updater.cc b/third_party/blink/renderer/core/paint/compositing/compositing_inputs_updater.cc
index 23841cd..53dcd18 100644
--- a/third_party/blink/renderer/core/paint/compositing/compositing_inputs_updater.cc
+++ b/third_party/blink/renderer/core/paint/compositing/compositing_inputs_updater.cc
@@ -305,7 +305,7 @@
   }
 
   ClipRect clip_rect;
-  layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  layer->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateBackgroundClipRect(
           ClipRectsContext(root_layer_,
                            &root_layer_->GetLayoutObject().FirstFragment(),
diff --git a/third_party/blink/renderer/core/paint/paint_layer.cc b/third_party/blink/renderer/core/paint/paint_layer.cc
index 6ee2e8f..16d6eed 100644
--- a/third_party/blink/renderer/core/paint/paint_layer.cc
+++ b/third_party/blink/renderer/core/paint/paint_layer.cc
@@ -1377,7 +1377,7 @@
 }
 
 void PaintLayer::ClearClipRects(ClipRectsCacheSlot cache_slot) {
-  Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  Clipper(GeometryMapperOption::kDoNotUseGeometryMapper)
       .ClearClipRectsIncludingDescendants(cache_slot);
 }
 
@@ -1636,7 +1636,7 @@
       root_layer, &root_layer->GetLayoutObject().FirstFragment(),
       kUncachedClipRects, overlay_scrollbar_clip_behavior,
       respect_overflow_clip, sub_pixel_accumulation);
-  Clipper(kUseGeometryMapper)
+  Clipper(GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(clip_rects_context, &GetLayoutObject().FirstFragment(),
                       cull_rect, fragment.layer_bounds,
                       fragment.background_rect, fragment.foreground_rect,
@@ -1734,7 +1734,7 @@
       fragment_cull_rect.emplace(rect);
     }
 
-    Clipper(kUseGeometryMapper)
+    Clipper(GeometryMapperOption::kUseGeometryMapper)
         .CalculateRects(
             clip_rects_context, fragment_data,
             fragment_cull_rect ? &*fragment_cull_rect : nullptr,
@@ -1978,7 +1978,7 @@
     // Make sure the parent's clip rects have been calculated.
     if (Parent()) {
       ClipRect clip_rect;
-      Clipper(PaintLayer::kUseGeometryMapper)
+      Clipper(GeometryMapperOption::kUseGeometryMapper)
           .CalculateBackgroundClipRect(
               ClipRectsContext(
                   root_layer, &root_layer->GetLayoutObject().FirstFragment(),
@@ -2633,7 +2633,7 @@
 
   // If there is a clip applied by an ancestor to this PaintLayer but below or
   // equal to |ancestorLayer|, apply that clip.
-  LayoutRect result = Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  LayoutRect result = Clipper(GeometryMapperOption::kDoNotUseGeometryMapper)
                           .LocalClipRect(composited_layer);
 
   result.Intersect(PhysicalBoundingBox(LayoutPoint()));
@@ -3166,7 +3166,8 @@
 
 PaintLayerClipper PaintLayer::Clipper(
     GeometryMapperOption geometry_mapper_option) const {
-  return PaintLayerClipper(*this, geometry_mapper_option == kUseGeometryMapper);
+  return PaintLayerClipper(*this, geometry_mapper_option ==
+                                      GeometryMapperOption::kUseGeometryMapper);
 }
 
 bool PaintLayer::ScrollsOverflow() const {
diff --git a/third_party/blink/renderer/core/paint/paint_layer.h b/third_party/blink/renderer/core/paint/paint_layer.h
index feed9f4..1bed4f0 100644
--- a/third_party/blink/renderer/core/paint/paint_layer.h
+++ b/third_party/blink/renderer/core/paint/paint_layer.h
@@ -669,7 +669,10 @@
     return scrollable_area_.Get();
   }
 
-  enum GeometryMapperOption { kUseGeometryMapper, kDoNotUseGeometryMapper };
+  enum class GeometryMapperOption {
+    kUseGeometryMapper,
+    kDoNotUseGeometryMapper
+  };
 
   PaintLayerClipper Clipper(GeometryMapperOption) const;
 
diff --git a/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc b/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc
index dc23092..b068340 100644
--- a/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc
+++ b/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc
@@ -48,14 +48,16 @@
       LayoutSize(FloatSize(0.25, 0.35)));
 
   ClipRect background_rect_gm;
-  target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateBackgroundClipRect(context, background_rect_gm);
 
   EXPECT_EQ(LayoutRect(FloatRect(8.25, 8.34375, 300, 300)),
             background_rect_gm.Rect());
 
   ClipRect background_rect_nogm;
-  target_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateBackgroundClipRect(context, background_rect_nogm);
 
   EXPECT_EQ(LayoutRect(FloatRect(8.25, 8.34375, 300, 300)),
@@ -78,14 +80,16 @@
       LayoutSize(FloatSize(0.25, 0.35)));
 
   ClipRect background_rect_gm;
-  target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateBackgroundClipRect(context, background_rect_gm);
 
   EXPECT_GE(background_rect_gm.Rect().Size().Width().ToInt(), 33554422);
   EXPECT_GE(background_rect_gm.Rect().Size().Height().ToInt(), 33554422);
 
   ClipRect background_rect_nogm;
-  target_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateBackgroundClipRect(context, background_rect_nogm);
 
   EXPECT_GE(background_rect_nogm.Rect().Size().Width().ToInt(), 33554422);
@@ -110,14 +114,16 @@
       LayoutSize(FloatSize(0.25, 0.35)));
 
   ClipRect background_rect_gm;
-  target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateBackgroundClipRect(context, background_rect_gm);
 
   EXPECT_GE(background_rect_gm.Rect().Size().Width().ToInt(), 33554422);
   EXPECT_GE(background_rect_gm.Rect().Size().Height().ToInt(), 33554422);
 
   ClipRect background_rect_nogm;
-  target_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateBackgroundClipRect(context, background_rect_nogm);
 
   EXPECT_GE(background_rect_nogm.Rect().Size().Width().ToInt(), 33554422);
@@ -145,7 +151,8 @@
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
 
-  target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context,
                       &target_paint_layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
@@ -175,7 +182,8 @@
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
 
-  target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context,
                       &target_paint_layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
@@ -215,7 +223,8 @@
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
 
-  target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context,
                       &target_paint_layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
@@ -256,7 +265,8 @@
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
 
-  child_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  child_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context,
                       &child_paint_layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
@@ -293,7 +303,8 @@
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
 
-  target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context,
                       &target_paint_layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
@@ -326,7 +337,8 @@
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
 
-  target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context,
                       &target_paint_layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
@@ -352,7 +364,7 @@
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
 
-  layer->Clipper(PaintLayer::kUseGeometryMapper)
+  layer->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context, &layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
   EXPECT_GE(background_rect.Rect().Size().Width().ToInt(), 33554422);
@@ -363,7 +375,7 @@
   ClipRectsContext context_clip(
       layer, &layer->GetLayoutObject().FirstFragment(), kUncachedClipRects);
 
-  layer->Clipper(PaintLayer::kUseGeometryMapper)
+  layer->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context_clip, &layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
   EXPECT_EQ(LayoutRect(0, 0, 200, 200), background_rect.Rect());
@@ -389,7 +401,7 @@
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
 
-  layer->Clipper(PaintLayer::kUseGeometryMapper)
+  layer->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context, &layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
   EXPECT_EQ(LayoutRect(0, 0, 200, 400), background_rect.Rect());
@@ -400,7 +412,7 @@
       layer->Parent(), &layer->Parent()->GetLayoutObject().FirstFragment(),
       kUncachedClipRects);
 
-  layer->Clipper(PaintLayer::kUseGeometryMapper)
+  layer->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context_clip, &layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
   EXPECT_EQ(LayoutRect(0, 0, 200, 200), background_rect.Rect());
@@ -426,11 +438,12 @@
   PaintLayer* fixed =
       ToLayoutBoxModelObject(GetLayoutObjectByElementId("fixed"))->Layer();
 
-  EXPECT_EQ(LayoutRect(0, 0, 100, 100),
-            transformed->Clipper(PaintLayer::kUseGeometryMapper)
-                .LocalClipRect(*transformed));
+  EXPECT_EQ(
+      LayoutRect(0, 0, 100, 100),
+      transformed->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
+          .LocalClipRect(*transformed));
   EXPECT_EQ(LayoutRect(0, 50, 100, 100),
-            fixed->Clipper(PaintLayer::kUseGeometryMapper)
+            fixed->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
                 .LocalClipRect(*transformed));
 }
 
@@ -462,7 +475,7 @@
   EXPECT_TRUE(parent->GetClipRectsCache());
   EXPECT_TRUE(child->GetClipRectsCache());
 
-  parent->Clipper(PaintLayer::kUseGeometryMapper)
+  parent->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .ClearClipRectsIncludingDescendants();
 
   EXPECT_FALSE(parent->GetClipRectsCache());
@@ -497,7 +510,7 @@
   EXPECT_TRUE(parent->GetClipRectsCache());
   EXPECT_TRUE(child->GetClipRectsCache());
 
-  child->Clipper(PaintLayer::kUseGeometryMapper)
+  child->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .ClearClipRectsIncludingDescendants();
 
   EXPECT_TRUE(parent->GetClipRectsCache());
@@ -524,7 +537,7 @@
   LayoutRect layer_bounds(infinite_rect);
   ClipRect background_rect(infinite_rect);
   ClipRect foreground_rect(infinite_rect);
-  target->Clipper(PaintLayer::kUseGeometryMapper)
+  target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context, &target->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
 
@@ -554,7 +567,7 @@
   LayoutRect layer_bounds(infinite_rect);
   ClipRect background_rect(infinite_rect);
   ClipRect foreground_rect(infinite_rect);
-  target->Clipper(PaintLayer::kUseGeometryMapper)
+  target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context, &target->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
 
@@ -569,7 +582,7 @@
   // Test without GeometryMapper.
   background_rect = infinite_rect;
   foreground_rect = infinite_rect;
-  target->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  target->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateRects(context, nullptr, nullptr, layer_bounds, background_rect,
                       foreground_rect);
   // The non-GeometryMapper path applies the immediate filter effect in
@@ -583,7 +596,7 @@
                                 kUncachedClipRects);
   background_rect = infinite_rect;
   foreground_rect = infinite_rect;
-  target->Clipper(PaintLayer::kUseGeometryMapper)
+  target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(root_context, &target->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
   // This includes the filter effect because it's applied before mapping the
@@ -594,7 +607,7 @@
   // Test mapping to the root layer without GeometryMapper.
   background_rect = infinite_rect;
   foreground_rect = infinite_rect;
-  target->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  target->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateRects(root_context, nullptr, nullptr, layer_bounds,
                       background_rect, foreground_rect);
   EXPECT_EQ(LayoutRect(38, 41, 204, 304), background_rect.Rect());
@@ -636,7 +649,7 @@
   LayoutRect layer_bounds(infinite_rect);
   ClipRect background_rect(infinite_rect);
   ClipRect foreground_rect(infinite_rect);
-  target->Clipper(PaintLayer::kUseGeometryMapper)
+  target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context, &target->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
 
@@ -672,7 +685,7 @@
   LayoutRect layer_bounds(infinite_rect);
   ClipRect background_rect(infinite_rect);
   ClipRect foreground_rect(infinite_rect);
-  target->Clipper(PaintLayer::kUseGeometryMapper)
+  target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context, &target->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
 
@@ -709,7 +722,7 @@
   LayoutRect layer_bounds(infinite_rect);
   ClipRect background_rect(infinite_rect);
   ClipRect foreground_rect(infinite_rect);
-  target->Clipper(PaintLayer::kUseGeometryMapper)
+  target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context, &target->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
 
@@ -747,7 +760,8 @@
                    .NextFragment()
                    ->NextFragment());
 
-  target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context,
                       &target_paint_layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
@@ -758,7 +772,8 @@
             foreground_rect.Rect());
   EXPECT_EQ(LayoutRect(FloatRect(0, 0, 100, 200)), layer_bounds);
 
-  target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  target_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(
           context,
           target_paint_layer->GetLayoutObject().FirstFragment().NextFragment(),
@@ -798,7 +813,8 @@
 
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
-  child_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  child_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context,
                       &child_paint_layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
@@ -808,7 +824,8 @@
   EXPECT_EQ(LayoutRect(0, 0, 193, 293), foreground_rect.Rect());
   EXPECT_EQ(LayoutRect(0, 0, 500, 500), layer_bounds);
 
-  child_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  child_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateRects(context, nullptr, nullptr, layer_bounds, background_rect,
                       foreground_rect);
 
@@ -842,7 +859,8 @@
 
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
-  child_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  child_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context,
                       &child_paint_layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
@@ -852,7 +870,8 @@
   EXPECT_EQ(LayoutRect(8, 8, 193, 293), foreground_rect.Rect());
   EXPECT_EQ(LayoutRect(8, 8, 500, 500), layer_bounds);
 
-  child_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  child_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateRects(context, nullptr, nullptr, layer_bounds, background_rect,
                       foreground_rect);
 
@@ -884,7 +903,8 @@
 
   LayoutRect layer_bounds;
   ClipRect background_rect, foreground_rect;
-  parent_paint_layer->Clipper(PaintLayer::kUseGeometryMapper)
+  parent_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper)
       .CalculateRects(context,
                       &parent_paint_layer->GetLayoutObject().FirstFragment(),
                       nullptr, layer_bounds, background_rect, foreground_rect);
@@ -895,7 +915,8 @@
   EXPECT_EQ(LayoutRect(0, 0, 193, 293), foreground_rect.Rect());
   EXPECT_EQ(LayoutRect(0, 0, 200, 300), layer_bounds);
 
-  parent_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+  parent_paint_layer
+      ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .CalculateRects(context, nullptr, nullptr, layer_bounds, background_rect,
                       foreground_rect);
 
@@ -922,12 +943,13 @@
   GetDocument()
       .GetLayoutView()
       ->Layer()
-      ->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+      ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .ClearClipRectsIncludingDescendants();
 
   {
     ClipRect clip_rect;
-    target_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+    target_layer
+        ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
         .CalculateBackgroundClipRect(
             ClipRectsContext(GetDocument().GetLayoutView()->Layer(),
                              &GetDocument().GetLayoutView()->FirstFragment(),
@@ -942,7 +964,8 @@
 
   {
     ClipRect clip_rect;
-    target_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+    target_layer
+        ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
         .CalculateBackgroundClipRect(
             ClipRectsContext(GetDocument().GetLayoutView()->Layer(),
                              &GetDocument().GetLayoutView()->FirstFragment(),
@@ -974,12 +997,13 @@
   GetDocument()
       .GetLayoutView()
       ->Layer()
-      ->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+      ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
       .ClearClipRectsIncludingDescendants();
 
   {
     ClipRect clip_rect;
-    target_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+    target_layer
+        ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
         .CalculateBackgroundClipRect(
             ClipRectsContext(GetDocument().GetLayoutView()->Layer(),
                              &GetDocument().GetLayoutView()->FirstFragment(),
@@ -994,7 +1018,8 @@
 
   {
     ClipRect clip_rect;
-    target_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper)
+    target_layer
+        ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper)
         .CalculateBackgroundClipRect(
             ClipRectsContext(GetDocument().GetLayoutView()->Layer(),
                              &GetDocument().GetLayoutView()->FirstFragment(),