Revert of Make GeometryMapper fully static

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

Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
index 21602b62f00361347a916439486a724e9eec5246..67f936682ca98f391266d6b6215caa1edb818859 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -2983,11 +2983,13 @@
 
 PaintLayerClipper PaintLayer::clipper(
     GeometryMapperOption geometryMapperOption) const {
+  GeometryMapper* geometryMapper = nullptr;
   if (geometryMapperOption == UseGeometryMapper) {
     DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
-    return PaintLayerClipper(*this, true);
-  }
-  return PaintLayerClipper(*this, false);
+    if (FrameView* frameView = m_layoutObject.document().view())
+      geometryMapper = &frameView->geometryMapper();
+  }
+  return PaintLayerClipper(*this, geometryMapper);
 }
 
 bool PaintLayer::scrollsOverflow() const {