Optimize PaintInvalidatorContext::mapLocalRectToVisualRectInBacking()

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

 // 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.
 
 #include "core/paint/PaintInvalidator.h"
 
 #include "core/editing/FrameSelection.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
@@ skipping 34 matching lines @@
 
 // TODO(wangxianzhu): Combine this into
 // PaintInvalidator::mapLocalRectToBacking() when removing
 // PaintInvalidationState.
 // This function is templatized to avoid FloatRect<->LayoutRect conversions
 // which affect performance.
 template <typename Rect, typename Point>
 static LayoutRect mapLocalRectToVisualRectInBacking(
     const LayoutObject& object,
     const Rect& localRect,
-    const PaintInvalidatorContext& context,
-    GeometryMapper& geometryMapper) {
+    const PaintInvalidatorContext& context) {
   if (localRect.isEmpty())
     return LayoutRect();
 
   bool isSVGChild = object.isSVGChild();
 
   // TODO(wkorman): The flip below is required because visual rects are
   // currently in "physical coordinates with flipped block-flow direction"
   // (see LayoutBoxModelObject.h) but we need them to be in physical
   // coordinates.
   Rect rect = localRect;
@@ skipping 56 matching lines @@
       if (!isSVGChild &&
           context.treeBuilderContext.current.transform !=
               containerContentsProperties->transform())
         rect = Rect(enclosingIntRect(rect));
 
       PropertyTreeState currentTreeState(
           context.treeBuilderContext.current.transform,
           context.treeBuilderContext.current.clip, nullptr);
 
       FloatRect floatRect(rect);
-      geometryMapper.sourceToDestinationVisualRect(
+      context.geometryMapper.sourceToDestinationVisualRect(
           currentTreeState, *containerContentsProperties, floatRect);
       result = LayoutRect(floatRect);
     }
 
     // Convert the result to the container's contents space.
     result.moveBy(-context.paintInvalidationContainer->paintOffset());
   }
 
   object.adjustVisualRectForRasterEffects(result);
 
   PaintLayer::mapRectInPaintInvalidationContainerToBacking(
       *context.paintInvalidationContainer, result);
 
   result.move(object.scrollAdjustmentForPaintInvalidation(
       *context.paintInvalidationContainer));
 
   return result;
 }
 
 void PaintInvalidatorContext::mapLocalRectToVisualRectInBacking(
     const LayoutObject& object,
     LayoutRect& rect) const {
-  std::unique_ptr<GeometryMapper> geometryMapper = GeometryMapper::create();
   rect = blink::mapLocalRectToVisualRectInBacking<LayoutRect, LayoutPoint>(
-      object, rect, *this, *geometryMapper);
+      object, rect, *this);
 }
 
 LayoutRect PaintInvalidator::computeVisualRectInBacking(
     const LayoutObject& object,
     const PaintInvalidatorContext& context) {
   if (object.isSVGChild()) {
     FloatRect localRect = SVGLayoutSupport::localVisualRect(object);
     return mapLocalRectToVisualRectInBacking<FloatRect, FloatPoint>(
-        object, localRect, context, m_geometryMapper);
+        object, localRect, context);
   }
   return mapLocalRectToVisualRectInBacking<LayoutRect, LayoutPoint>(
-      object, object.localVisualRect(), context, m_geometryMapper);
+      object, object.localVisualRect(), context);
 }
 
 LayoutPoint PaintInvalidator::computeLocationInBacking(
     const LayoutObject& object,
     const PaintInvalidatorContext& context) {
   // In SPv2, locationInBacking is in the space of their local transform node.
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
     return object.paintOffset();
 
   LayoutPoint point;
   if (object != context.paintInvalidationContainer) {
     point.moveBy(object.paintOffset());
 
     const auto* containerTransform =
         context.paintInvalidationContainer->paintProperties()
             ->contentsProperties()
             ->transform();
     if (context.treeBuilderContext.current.transform != containerTransform) {
       FloatRect rect = FloatRect(FloatPoint(point), FloatSize());
-      m_geometryMapper.sourceToDestinationRect(
+      context.geometryMapper.sourceToDestinationRect(
           context.treeBuilderContext.current.transform, containerTransform,
           rect);
       point = LayoutPoint(rect.location());
     }
 
     // Convert the result to the container's contents space.
     point.moveBy(-context.paintInvalidationContainer->paintOffset());
   }
 
   if (context.paintInvalidationContainer->layer()->groupedMapping()) {
@@ skipping 290 matching lines @@
   }
 }
 
 void PaintInvalidator::processPendingDelayedPaintInvalidations() {
   for (auto target : m_pendingDelayedPaintInvalidations)
     target->getMutableForPainting().setShouldDoFullPaintInvalidation(
         PaintInvalidationDelayedFull);
 }
 
 }  // namespace blink