Revert of Make GeometryMapper fully static

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

Index: third_party/WebKit/Source/core/paint/PaintLayerClipper.h
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerClipper.h b/third_party/WebKit/Source/core/paint/PaintLayerClipper.h
index 7b4b6563125c4e14ad0595b722b8d7a6f5430bac..afecdc963302cf9cddae52fe03bea95acf78895f 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerClipper.h
+++ b/third_party/WebKit/Source/core/paint/PaintLayerClipper.h
@@ -48,6 +48,7 @@
 #include "core/CoreExport.h"
 #include "core/paint/ClipRectsCache.h"
 
+#include "platform/graphics/paint/GeometryMapper.h"
 #include "platform/scroll/ScrollTypes.h"
 
 #include "wtf/Allocator.h"
@@ -55,7 +56,6 @@
 namespace blink {
 
 class PaintLayer;
-class PropertyTreeState;
 
 enum ShouldRespectOverflowClipType { IgnoreOverflowClip, RespectOverflowClip };
 
@@ -172,7 +172,7 @@
   DISALLOW_NEW();
 
  public:
-  explicit PaintLayerClipper(const PaintLayer&, bool useGeometryMapper);
+  explicit PaintLayerClipper(const PaintLayer&, GeometryMapper*);
 
   void clearClipRectsIncludingDescendants();
   void clearClipRectsIncludingDescendants(ClipRectsCacheSlot);
@@ -242,7 +242,7 @@
   ALWAYS_INLINE LayoutRect localVisualRect() const;
 
   const PaintLayer& m_layer;
-  bool m_useGeometryMapper;
+  GeometryMapper* m_geometryMapper;
 
   friend class PaintLayerClipperTest;
 };