Revert of Make GeometryMapper fully static

third_party/WebKit/Source/core/frame/FrameView.h

Index: third_party/WebKit/Source/core/frame/FrameView.h
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
index 487f1d86ad9e9ff2c3f6089b2ec80099c6854a62..eed99366cee501408991c81894f4a0694309cff8 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.h
+++ b/third_party/WebKit/Source/core/frame/FrameView.h
@@ -69,6 +69,7 @@
 class ElementVisibilityObserver;
 class Frame;
 class FloatSize;
+class GeometryMapper;
 class JSONArray;
 class JSONObject;
 class LayoutItem;
@@ -830,6 +831,9 @@
   void setAnimationTimeline(std::unique_ptr<CompositorAnimationTimeline>);
   void setAnimationHost(std::unique_ptr<CompositorAnimationHost>);
 
+  // Returns the GeometryMapper associated with the root local frame.
+  GeometryMapper& geometryMapper();
+
   void crossOriginStatusChanged();
 
   // The visual viewport can supply scrollbars which affect the existence of
@@ -1219,6 +1223,8 @@
   std::unique_ptr<CompositorAnimationTimeline> m_animationTimeline;
   std::unique_ptr<CompositorAnimationHost> m_animationHost;
 
+  std::unique_ptr<GeometryMapper> m_geometryMapper;
+
   Member<PrintContext> m_printContext;
 
   FRIEND_TEST_ALL_PREFIXES(WebViewTest, DeviceEmulationResetScrollbars);