Revert of Make GeometryMapper fully static

third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp

Index: third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
diff --git a/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp b/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
index ef27986c97a515c4c244cd3f4ad4975feed3539e..5fd170864b56105a61e443e271fefd22b4afbc01 100644
--- a/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
+++ b/third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp
@@ -635,11 +635,17 @@
   return dummyContext;
 }
 
+static GeometryMapper& dummyGeometryMapper() {
+  DEFINE_STATIC_LOCAL(std::unique_ptr<GeometryMapper>, dummyMapper,
+                      (GeometryMapper::create()));
+  return *dummyMapper;
+}
+
 PaintInvalidatorContextAdapter::PaintInvalidatorContextAdapter(
     const PaintInvalidationState& paintInvalidationState)
     // The dummy parameters will be never used because the overriding
     // mapLocalRectToVisualRectInBacking() uses PaintInvalidationState.
-    : PaintInvalidatorContext(dummyTreeBuilderContext()),
+    : PaintInvalidatorContext(dummyTreeBuilderContext(), dummyGeometryMapper()),
       m_paintInvalidationState(paintInvalidationState) {
   forcedSubtreeInvalidationFlags =
       paintInvalidationState.m_forcedSubtreeInvalidationFlags;