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