Revert of Make GeometryMapper fully static

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

Index: third_party/WebKit/Source/core/paint/PaintInvalidator.h
diff --git a/third_party/WebKit/Source/core/paint/PaintInvalidator.h b/third_party/WebKit/Source/core/paint/PaintInvalidator.h
index fb56f491e1a2b84a417098116659c1284f8b722f..37e609a2abd27fb80c88f674a7313668d31b4d0d 100644
--- a/third_party/WebKit/Source/core/paint/PaintInvalidator.h
+++ b/third_party/WebKit/Source/core/paint/PaintInvalidator.h
@@ -6,6 +6,7 @@
 #define PaintInvalidator_h
 
 #include "platform/geometry/LayoutRect.h"
+#include "platform/graphics/paint/GeometryMapper.h"
 #include "wtf/Vector.h"
 
 namespace blink {
@@ -18,8 +19,11 @@
 
 struct PaintInvalidatorContext {
   PaintInvalidatorContext(
-      const PaintPropertyTreeBuilderContext& treeBuilderContext)
-      : parentContext(nullptr), m_treeBuilderContext(treeBuilderContext) {}
+      const PaintPropertyTreeBuilderContext& treeBuilderContext,
+      GeometryMapper& geometryMapper)
+      : parentContext(nullptr),
+        m_treeBuilderContext(treeBuilderContext),
+        m_geometryMapper(geometryMapper) {}
 
   PaintInvalidatorContext(
       const PaintPropertyTreeBuilderContext& treeBuilderContext,
@@ -31,7 +35,8 @@
         paintInvalidationContainerForStackedContents(
             parentContext.paintInvalidationContainerForStackedContents),
         paintingLayer(parentContext.paintingLayer),
-        m_treeBuilderContext(treeBuilderContext) {}
+        m_treeBuilderContext(treeBuilderContext),
+        m_geometryMapper(parentContext.m_geometryMapper) {}
 
   // This method is virtual temporarily to adapt PaintInvalidatorContext and the
   // legacy PaintInvalidationState for code shared by old code and new code.
@@ -97,6 +102,7 @@
  private:
   friend class PaintInvalidator;
   const PaintPropertyTreeBuilderContext& m_treeBuilderContext;
+  GeometryMapper& m_geometryMapper;
 };
 
 class PaintInvalidator {