Revert of Make GeometryMapper fully static

third_party/WebKit/Source/core/paint/PaintLayer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
  * reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 2965 matching lines @@
   updateTransform(oldStyle, layoutObject().styleRef());
   updateFilters(oldStyle, layoutObject().styleRef());
   updateClipPath(oldStyle, layoutObject().styleRef());
 
   setNeedsCompositingInputsUpdate();
   layoutObject().setNeedsPaintPropertyUpdate();
 }
 
 PaintLayerClipper PaintLayer::clipper(
     GeometryMapperOption geometryMapperOption) const {
+  GeometryMapper* geometryMapper = nullptr;
   if (geometryMapperOption == UseGeometryMapper) {
     DCHECK(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled());
-    return PaintLayerClipper(*this, true);
+    if (FrameView* frameView = m_layoutObject.document().view())
+      geometryMapper = &frameView->geometryMapper();
   }
-  return PaintLayerClipper(*this, false);
+  return PaintLayerClipper(*this, geometryMapper);
 }
 
 bool PaintLayer::scrollsOverflow() const {
   if (PaintLayerScrollableArea* scrollableArea = this->getScrollableArea())
     return scrollableArea->scrollsOverflow();
 
   return false;
 }
 
 FilterOperations PaintLayer::addReflectionToFilterOperations(
@@ skipping 235 matching lines @@
 }
 
 void showLayerTree(const blink::LayoutObject* layoutObject) {
   if (!layoutObject) {
     LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
     return;
   }
   showLayerTree(layoutObject->enclosingLayer());
 }
 #endif