Revert of Reduce copying of local data structures in GeometryMapper and PaintLayerClipper.

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 109 matching lines @@
       // enclosingIntRect is applied in the last step of paint invalidation
       // (see CompositedLayerMapping::setContentsNeedDisplayInRect()).
       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(
-          currentTreeState, *containerContentsProperties, floatRect);
-      result = LayoutRect(floatRect);
+      result = LayoutRect(
+          geometryMapper
+              .sourceToDestinationVisualRect(FloatRect(rect), currentTreeState,
+                                             *containerContentsProperties)
+              .rect());
     }
 
     // Convert the result to the container's contents space.
     result.moveBy(-context.paintInvalidationContainer->paintOffset());
   }
 
   object.adjustVisualRectForRasterEffects(result);
 
   PaintLayer::mapRectInPaintInvalidationContainerToBacking(
       *context.paintInvalidationContainer, result);
@@ skipping 30 matching lines @@
 
   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.treeBuilderContext.current.transform, containerTransform,
-          rect);
-      point = LayoutPoint(rect.location());
+      point = LayoutPoint(m_geometryMapper
+                              .sourceToDestinationRect(
+                                  FloatRect(FloatPoint(point), FloatSize()),
+                                  context.treeBuilderContext.current.transform,
+                                  containerTransform)
+                              .location());
     }
 
     // Convert the result to the container's contents space.
     point.moveBy(-context.paintInvalidationContainer->paintOffset());
   }
 
   if (context.paintInvalidationContainer->layer()->groupedMapping()) {
     FloatPoint floatPoint(point);
     PaintLayer::mapPointInPaintInvalidationContainerToBacking(
         *context.paintInvalidationContainer, floatPoint);
@@ skipping 290 matching lines @@
   }
 }
 
 void PaintInvalidator::processPendingDelayedPaintInvalidations() {
   for (auto target : m_pendingDelayedPaintInvalidations)
     target->getMutableForPainting().setShouldDoFullPaintInvalidation(
         PaintInvalidationDelayedFull);
 }
 
 }  // namespace blink