Revert of Make GeometryMapper fully static

third_party/WebKit/Source/core/layout/VisualRectMappingTest.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 "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/PaintInvalidationState.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/PaintPropertyTreePrinter.h"
-#include "platform/graphics/paint/GeometryMapper.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
 
 class VisualRectMappingTest : public RenderingTest {
  public:
   VisualRectMappingTest()
       : RenderingTest(SingleChildLocalFrameClient::create()) {}
 
  protected:
@@ skipping 16 matching lines @@
                        const LayoutRect& expectedVisualRect,
                        bool adjustForBacking = false) {
     LayoutRect slowMapRect = localRect;
     object.mapToVisualRectInAncestorSpace(&ancestor, slowMapRect);
     if (slowMapRect.isEmpty() && object.visualRect().isEmpty())
       return;
 
     FloatRect geometryMapperRect(localRect);
     if (object.paintProperties() || object.localBorderBoxProperties()) {
       geometryMapperRect.moveBy(FloatPoint(object.paintOffset()));
-      GeometryMapper::sourceToDestinationVisualRect(
+      document().view()->geometryMapper().sourceToDestinationVisualRect(
           *object.localBorderBoxProperties(), *ancestor.contentsProperties(),
           geometryMapperRect);
       geometryMapperRect.moveBy(-FloatPoint(ancestor.paintOffset()));
     }
 
     // The following condition can be false if paintInvalidationContainer is
     // a LayoutView and compositing is not enabled.
     if (adjustForBacking && ancestor.isPaintInvalidationContainer()) {
       PaintLayer::mapRectInPaintInvalidationContainerToBacking(ancestor,
                                                                slowMapRect);
@@ skipping 766 matching lines @@
   // getTransformfromContainter includes transform and perspective matrix
   // of the container.
   target->getTransformFromContainer(container, LayoutSize(), targetMatrix);
   matrix *= targetMatrix;
   LayoutRect output(matrix.mapRect(FloatRect(originalRect)));
 
   checkVisualRect(*target, *target->view(), originalRect, output);
 }
 
 }  // namespace blink