Revert of Make GeometryMapper fully static

third_party/WebKit/Source/core/paint/PaintInvalidator.h

 // Copyright 2016 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.
 
 #ifndef PaintInvalidator_h
 #define PaintInvalidator_h
 
 #include "platform/geometry/LayoutRect.h"
+#include "platform/graphics/paint/GeometryMapper.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class FrameView;
 class LayoutBoxModelObject;
 class LayoutObject;
 class PaintLayer;
 struct PaintPropertyTreeBuilderContext;
 
 struct PaintInvalidatorContext {
   PaintInvalidatorContext(
-      const PaintPropertyTreeBuilderContext& treeBuilderContext)
-      : parentContext(nullptr), m_treeBuilderContext(treeBuilderContext) {}
+      const PaintPropertyTreeBuilderContext& treeBuilderContext,
+      GeometryMapper& geometryMapper)
+      : parentContext(nullptr),
+        m_treeBuilderContext(treeBuilderContext),
+        m_geometryMapper(geometryMapper) {}
 
   PaintInvalidatorContext(
       const PaintPropertyTreeBuilderContext& treeBuilderContext,
       const PaintInvalidatorContext& parentContext)
       : parentContext(&parentContext),
         forcedSubtreeInvalidationFlags(
             parentContext.forcedSubtreeInvalidationFlags),
         paintInvalidationContainer(parentContext.paintInvalidationContainer),
         paintInvalidationContainerForStackedContents(
             parentContext.paintInvalidationContainerForStackedContents),
         paintingLayer(parentContext.paintingLayer),
-        m_treeBuilderContext(treeBuilderContext) {}
+        m_treeBuilderContext(treeBuilderContext),
+        m_geometryMapper(parentContext.m_geometryMapper) {}
 
   // This method is virtual temporarily to adapt PaintInvalidatorContext and the
   // legacy PaintInvalidationState for code shared by old code and new code.
   virtual void mapLocalRectToVisualRectInBacking(const LayoutObject&,
                                                  LayoutRect&) const;
 
   const PaintInvalidatorContext* parentContext;
 
   enum ForcedSubtreeInvalidationFlag {
     ForcedSubtreeInvalidationChecking = 1 << 0,
@@ skipping 45 matching lines @@
   // invalidation backing's coordinates. They are used to detect layoutObject
   // shifts that force a full invalidation and invalidation check in subtree.
   // The points do *not* account for composited scrolling. See
   // LayoutObject::adjustVisualRectForCompositedScrolling().
   LayoutPoint oldLocation;
   LayoutPoint newLocation;
 
  private:
   friend class PaintInvalidator;
   const PaintPropertyTreeBuilderContext& m_treeBuilderContext;
+  GeometryMapper& m_geometryMapper;
 };
 
 class PaintInvalidator {
  public:
   void invalidatePaintIfNeeded(FrameView&, PaintInvalidatorContext&);
   void invalidatePaintIfNeeded(const LayoutObject&, PaintInvalidatorContext&);
 
   // Process objects needing paint invalidation on the next frame.
   // See the definition of PaintInvalidationDelayedFull for more details.
   void processPendingDelayedPaintInvalidations();
@@ skipping 17 matching lines @@
                                                       PaintInvalidatorContext&);
   ALWAYS_INLINE void updateVisualRect(const LayoutObject&,
                                       PaintInvalidatorContext&);
 
   Vector<const LayoutObject*> m_pendingDelayedPaintInvalidations;
 };
 
 }  // namespace blink
 
 #endif  // PaintInvalidator_h