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

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

Index: third_party/WebKit/Source/core/paint/PaintLayerClipper.h
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerClipper.h b/third_party/WebKit/Source/core/paint/PaintLayerClipper.h
index 61d860fc53be22cec7e8dd61108cd91a8a8ea6b0..87d409de78d721b1c3e255034868a8dec739476f 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerClipper.h
+++ b/third_party/WebKit/Source/core/paint/PaintLayerClipper.h
@@ -183,8 +183,7 @@
 
   // Computes the same thing as backgroundRect in calculateRects(), but skips
   // applying CSS clip and the visualOverflowRect() of |m_layer|.
-  void calculateBackgroundClipRect(const ClipRectsContext&,
-                                   ClipRect& output) const;
+  ClipRect backgroundClipRect(const ClipRectsContext&) const;
 
   // This method figures out our layerBounds in coordinates relative to
   // |rootLayer|. It also computes our background and foreground clip rects
@@ -215,10 +214,9 @@
   bool shouldClipOverflow(const ClipRectsContext&) const;
   bool shouldRespectOverflowClip(const ClipRectsContext&) const;
 
-  // Returned clip rect in |output| is in the space of the context's rootLayer.
-  void calculateClipRectWithGeometryMapper(const ClipRectsContext&,
-                                           bool isForeground,
-                                           ClipRect& output) const;
+  // Returned clip rect is in the space of the context's rootLayer.
+  ClipRect clipRectWithGeometryMapper(const ClipRectsContext&,
+                                      bool isForeground) const;
   // Mutates the given rect into a rect in the space of the context's
   // rootLayer.
   void mapLocalToRootWithGeometryMapper(const ClipRectsContext&,