Revert of Make GeometryMapper fully static

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

Index: third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp b/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
index 7d84659985f4f467418dcc5bed68fe6d6e7341a9..b208df2e9058015007e597387b0e3d6d2f944ccf 100644
--- a/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintInvalidator.cpp
@@ -17,7 +17,6 @@
 #include "core/paint/PaintLayer.h"
 #include "core/paint/PaintLayerScrollableArea.h"
 #include "core/paint/PaintPropertyTreeBuilder.h"
-#include "platform/graphics/paint/GeometryMapper.h"
 #include "wtf/Optional.h"
 
 namespace blink {
@@ -128,7 +127,7 @@
           context.m_treeBuilderContext.current.clip, nullptr);
 
       FloatRect floatRect(rect);
-      GeometryMapper::sourceToDestinationVisualRect(
+      context.m_geometryMapper.sourceToDestinationVisualRect(
           currentTreeState, *containerContentsProperties, floatRect);
       result = LayoutRect(floatRect);
     }
@@ -183,7 +182,7 @@
         context.paintInvalidationContainer->contentsProperties()->transform();
     if (context.m_treeBuilderContext.current.transform != containerTransform) {
       FloatRect rect = FloatRect(FloatPoint(point), FloatSize());
-      GeometryMapper::sourceToDestinationRect(
+      context.m_geometryMapper.sourceToDestinationRect(
           context.m_treeBuilderContext.current.transform, containerTransform,
           rect);
       point = LayoutPoint(rect.location());