Revert of Make GeometryMapper fully static

third_party/WebKit/Source/platform/graphics/paint/PaintArtifact.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/paint/PaintArtifact.h"
 
 #include "cc/paint/display_item_list.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/graphics/compositing/PaintChunksToCcLayer.h"
@@ skipping 82 matching lines @@
   } else {
     replay(bounds, *graphicsContext.canvas());
   }
 }
 
 void PaintArtifact::replay(const FloatRect& bounds,
                            PaintCanvas& canvas,
                            const PropertyTreeState& replayState) const {
   TRACE_EVENT0("blink,benchmark", "PaintArtifact::replay");
   DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+  std::unique_ptr<GeometryMapper> geometryMapper = GeometryMapper::create();
   Vector<const PaintChunk*> pointerPaintChunks;
   pointerPaintChunks.reserveInitialCapacity(paintChunks().size());
 
   // TODO(chrishtr): it's sad to have to copy this vector just to turn
   // references into pointers.
   for (const auto& chunk : paintChunks())
     pointerPaintChunks.push_back(&chunk);
   scoped_refptr<cc::DisplayItemList> displayItemList =
       PaintChunksToCcLayer::convert(pointerPaintChunks, replayState,
-                                    gfx::Vector2dF(), getDisplayItemList());
+                                    gfx::Vector2dF(), getDisplayItemList(),
+                                    *geometryMapper);
   canvas.drawDisplayItemList(displayItemList);
 }
 
 DISABLE_CFI_PERF
 void PaintArtifact::appendToWebDisplayItemList(WebDisplayItemList* list) const {
   TRACE_EVENT0("blink,benchmark", "PaintArtifact::appendToWebDisplayItemList");
   size_t visualRectIndex = 0;
   for (const DisplayItem& displayItem : m_displayItemList) {
     displayItem.appendToWebDisplayItemList(
         m_displayItemList.visualRect(visualRectIndex), list);
     visualRectIndex++;
   }
   list->setIsSuitableForGpuRasterization(isSuitableForGpuRasterization());
 }
 
 }  // namespace blink