[SPInvalidation] Use GeometryMapper in PaintLayerClipper for paint.

third_party/WebKit/Source/core/paint/PaintLayer.h

Index: third_party/WebKit/Source/core/paint/PaintLayer.h
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.h b/third_party/WebKit/Source/core/paint/PaintLayer.h
index 1ccc905bee7a665be7dc5e495c3ab7f25d6ab480..03ebca10781fdd2079b54bdb7c1aee9a01af8dbd 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.h
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.h
@@ -625,10 +625,9 @@ class CORE_EXPORT PaintLayer : public DisplayItemClient {
     return m_scrollableArea.get();
   }
 
-  PaintLayerClipper clipper() const {
-    return PaintLayerClipper(*this,
-                             RuntimeEnabledFeatures::slimmingPaintV2Enabled());
-  }
+  enum GeometryMapperOption { UseGeometryMapper, DoNotUseGeometryMapper };
+
+  PaintLayerClipper clipper(GeometryMapperOption) const;
 
   bool scrollsOverflow() const;
 
@@ -848,6 +847,7 @@ class CORE_EXPORT PaintLayer : public DisplayItemClient {
       const PaintLayer* rootLayer,
       const LayoutRect& dirtyRect,
       ClipRectsCacheSlot,
+      GeometryMapperOption,
       OverlayScrollbarClipBehavior = IgnoreOverlayScrollbarSize,
       ShouldRespectOverflowClipType = RespectOverflowClip,
       const LayoutPoint* offsetFromRoot = 0,
@@ -857,6 +857,7 @@ class CORE_EXPORT PaintLayer : public DisplayItemClient {
       const PaintLayer* rootLayer,
       const LayoutRect& dirtyRect,
       ClipRectsCacheSlot,
+      GeometryMapperOption,
       OverlayScrollbarClipBehavior = IgnoreOverlayScrollbarSize,
       ShouldRespectOverflowClipType = RespectOverflowClip,
       const LayoutPoint* offsetFromRoot = 0,