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

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

 // Copyright 2015 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/PaintPropertyTreeBuilderTest.h"
 
 #include "core/html/HTMLIFrameElement.h"
 #include "core/layout/LayoutTreeAsText.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintPropertyTreePrinter.h"
@@ skipping 65 matching lines @@
 }
 
 #define CHECK_VISUAL_RECT(expected, sourceLayoutObject, ancestorLayoutObject,  \
                           slopFactor)                                          \
   do {                                                                         \
     std::unique_ptr<GeometryMapper> geometryMapper = GeometryMapper::create(); \
     LayoutRect source((sourceLayoutObject)->localVisualRect());                \
     source.moveBy((sourceLayoutObject)->paintOffset());                        \
     const auto& contentsProperties =                                           \
         *(ancestorLayoutObject)->paintProperties()->contentsProperties();      \
-    FloatRect actualFloatRect(source);                                         \
-    geometryMapper->sourceToDestinationVisualRect(                             \
-        *(sourceLayoutObject)->paintProperties()->localBorderBoxProperties(),  \
-        contentsProperties, actualFloatRect);                                  \
-    LayoutRect actual(actualFloatRect);                                        \
+    LayoutRect actual = LayoutRect(                                            \
+        geometryMapper                                                         \
+            ->sourceToDestinationVisualRect(FloatRect(source),                 \
+                                            *(sourceLayoutObject)              \
+                                                 ->paintProperties()           \
+                                                 ->localBorderBoxProperties(), \
+                                            contentsProperties)                \
+            .rect());                                                          \
     actual.moveBy(-(ancestorLayoutObject)->paintOffset());                     \
     EXPECT_EQ(expected, actual)                                                \
         << "GeometryMapper: expected: " << expected.toString()                 \
         << ", actual: " << actual.toString();                                  \
                                                                                \
     if (slopFactor == LayoutUnit::max())                                       \
       break;                                                                   \
     LayoutRect slowPathRect = (sourceLayoutObject)->localVisualRect();         \
     (sourceLayoutObject)                                                       \
         ->mapToVisualRectInAncestorSpace(ancestorLayoutObject, slowPathRect);  \
@@ skipping 3223 matching lines @@
   Element* mask = document().getElementById("mask");
   mask->setAttribute(HTMLNames::styleAttr, "height: 200px");
   document().view()->updateAllLifecyclePhases();
 
   ASSERT_EQ(properties, paintPropertiesForElement("mask"));
   ASSERT_EQ(maskClip, properties->maskClip());
   EXPECT_EQ(FloatRoundedRect(8, 8, 100, 200), maskClip->clipRect());
 }
 
 }  // namespace blink