[SPInvalidation] Use GeometryMapper in PaintLayerClipper for paint.

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

Index: third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
index 9abd6514169a19bc020e86e0832c9e64351634e2..caee5ade45f2c44ebb2db4ec88a71ccc8041ef41 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp
@@ -227,7 +227,7 @@ static bool shouldRepaintSubsequence(
 
   // Repaint if layer's clip changes.
   if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
-    ClipRects& clipRects = paintLayer.clipper().paintingClipRects(
+    ClipRects& clipRects = paintLayer.clipper(false).paintingClipRects(
         paintingInfo.rootLayer, respectOverflowClip, subpixelAccumulation);
     ClipRects* previousClipRects = paintLayer.previousPaintingClipRects();
     if (&clipRects != previousClipRects &&
@@ -445,6 +445,7 @@ PaintResult PaintLayerPainter::paintLayerContents(
       paintLayerForFragments->appendSingleFragmentIgnoringPagination(
           layerFragments, localPaintingInfo.rootLayer,
           localPaintingInfo.paintDirtyRect, cacheSlot,
+          RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled(),
           IgnoreOverlayScrollbarSize, respectOverflowClip, &offsetFromRoot,
           localPaintingInfo.subPixelAccumulation);
     } else if (isFixedPositionObjectInPagedMedia()) {
@@ -452,6 +453,7 @@ PaintResult PaintLayerPainter::paintLayerContents(
       paintLayerForFragments->appendSingleFragmentIgnoringPagination(
           singleFragment, localPaintingInfo.rootLayer,
           localPaintingInfo.paintDirtyRect, cacheSlot,
+          RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled(),
           IgnoreOverlayScrollbarSize, respectOverflowClip, &offsetFromRoot,
           localPaintingInfo.subPixelAccumulation);
       repeatFixedPositionObjectInPages(singleFragment[0], paintingInfo,
@@ -460,6 +462,7 @@ PaintResult PaintLayerPainter::paintLayerContents(
       paintLayerForFragments->collectFragments(
           layerFragments, localPaintingInfo.rootLayer,
           localPaintingInfo.paintDirtyRect, cacheSlot,
+          RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled(),
           IgnoreOverlayScrollbarSize, respectOverflowClip, &offsetFromRoot,
           localPaintingInfo.subPixelAccumulation);
     }
@@ -719,7 +722,8 @@ PaintResult PaintLayerPainter::paintLayerWithTransform(
     // here.
     paginationLayer->collectFragments(
         layerFragments, paintingInfo.rootLayer, paintingInfo.paintDirtyRect,
-        cacheSlot, IgnoreOverlayScrollbarSize, respectOverflowClip, nullptr,
+        cacheSlot, RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled(),
+        IgnoreOverlayScrollbarSize, respectOverflowClip, nullptr,
         paintingInfo.subPixelAccumulation, &transformedExtent);
   }
 
@@ -740,7 +744,10 @@ PaintResult PaintLayerPainter::paintLayerWithTransform(
           IgnoreOverflowClip)
         clipRectsContext.setIgnoreOverflowClip();
       ancestorBackgroundClipRect =
-          m_paintLayer.clipper().backgroundClipRect(clipRectsContext);
+          m_paintLayer
+              .clipper(
+                  RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
+              .backgroundClipRect(clipRectsContext);
     }
   }