Make GeometryMapper fully static

third_party/WebKit/Source/core/frame/FrameView.cpp

Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 9a608ea2d0aa84af160a63d7440a00ca320aed39..19552fe3689da9ca4ee0dadbfeaa7fe3f83ba386 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -2870,19 +2870,6 @@ void FrameView::updateGeometriesIfNeeded() {
   updateGeometries();
 }
 
-GeometryMapper& FrameView::geometryMapper() {
-  DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
-  DCHECK(lifecycle().state() >= DocumentLifecycle::InPrePaint);
-
-  if (m_frame->isLocalRoot()) {
-    if (!m_geometryMapper)
-      m_geometryMapper = GeometryMapper::create();
-    return *m_geometryMapper.get();
-  }
-
-  return frame().localFrameRoot()->view()->geometryMapper();
-}
-
 void FrameView::updateAllLifecyclePhases() {
   frame().localFrameRoot()->view()->updateLifecyclePhasesInternal(
       DocumentLifecycle::PaintClean);
@@ -3150,7 +3137,7 @@ void FrameView::prePaint() {
 
   if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
     SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.PrePaint.UpdateTime");
-    PrePaintTreeWalk(geometryMapper()).walk(*this);
+    PrePaintTreeWalk().walk(*this);
   }
 
   forAllNonThrottledFrameViews([](FrameView& frameView) {
@@ -3258,11 +3245,10 @@ void FrameView::pushPaintArtifactToCompositor() {
 
   SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Compositing.UpdateTime");
 
-  DCHECK(m_geometryMapper.get());
   m_paintArtifactCompositor->update(
       m_paintController->paintArtifact(),
       m_paintController->paintChunksRasterInvalidationTrackingMap(),
-      m_isStoringCompositedLayerDebugInfo, *m_geometryMapper);
+      m_isStoringCompositedLayerDebugInfo);
 }
 
 std::unique_ptr<JSONObject> FrameView::compositedLayersAsJSON(