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

third_party/WebKit/Source/core/paint/PrePaintTreeWalk.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/PrePaintTreeWalk.h"
 
 #include "core/dom/DocumentLifecycle.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"
@@ skipping 96 matching lines @@
 
 // Returns whether |a| is an ancestor of or equal to |b|.
 static bool isAncestorOfOrEqualTo(const ClipPaintPropertyNode* a,
                                   const ClipPaintPropertyNode* b) {
   while (b && b != a) {
     b = b->parent();
   }
   return b == a;
 }
 
-void PrePaintTreeWalk::computeClipRectForContext(
+FloatClipRect PrePaintTreeWalk::clipRectForContext(
     const PaintPropertyTreeBuilderContext::ContainingBlockContext& context,
     const EffectPaintPropertyNode* effect,
     const PropertyTreeState& ancestorState,
     const LayoutPoint& ancestorPaintOffset,
-    bool& hasClip,
-    FloatClipRect& clipRect) {
+    bool& hasClip) {
   // Only return a non-infinite clip if clips differ, or the "ancestor" state is
   // actually an ancestor clip. This ensures no accuracy issues due to
   // transforms applied to infinite rects.
   if (isAncestorOfOrEqualTo(context.clip, ancestorState.clip()))
-    clipRect = FloatClipRect();
+    return FloatClipRect();
 
   hasClip = true;
+
   PropertyTreeState localState(context.transform, context.clip, effect);
 
-  clipRect =
-      m_geometryMapper.sourceToDestinationClipRect(localState, ancestorState);
-  clipRect.moveBy(-FloatPoint(ancestorPaintOffset));
+  FloatClipRect rect(
+      m_geometryMapper.sourceToDestinationClipRect(localState, ancestorState));
+
+  rect.moveBy(-FloatPoint(ancestorPaintOffset));
+  return rect;
 }
 
 void PrePaintTreeWalk::invalidatePaintLayerOptimizationsIfNeeded(
     const LayoutObject& object,
     PrePaintTreeWalkContext& context) {
   if (!object.hasLayer())
     return;
 
   PaintLayer& paintLayer = *toLayoutBoxModelObject(object).layer();
   if (object.styleRef().hasTransform() ||
@@ skipping 25 matching lines @@
   ClipRects& oldClipRects =
       paintLayer.clipper(PaintLayer::DoNotUseGeometryMapper)
           .paintingClipRects(&ancestorTransformedOrRootPaintLayer,
                              respectOverflowClip, LayoutSize());
 #endif
 
   bool hasClip = false;
   RefPtr<ClipRects> clipRects = ClipRects::create();
   const LayoutPoint& ancestorPaintOffset =
       context.ancestorTransformedOrRootPaintLayer->layoutObject().paintOffset();
-
-  FloatClipRect clipRect;
-  computeClipRectForContext(context.treeBuilderContext.current, effect,
-                            ancestorState, ancestorPaintOffset, hasClip,
-                            clipRect);
-  clipRects->setOverflowClipRect(clipRect);
+  clipRects->setOverflowClipRect(
+      clipRectForContext(context.treeBuilderContext.current, effect,
+                         ancestorState, ancestorPaintOffset, hasClip));
 #ifdef CHECK_CLIP_RECTS
   CHECK(!hasClip ||
         clipRects->overflowClipRect() == oldClipRects.overflowClipRect())
       << "rect= " << clipRects->overflowClipRect().toString();
 #endif
 
-  computeClipRectForContext(context.treeBuilderContext.fixedPosition, effect,
-                            ancestorState, ancestorPaintOffset, hasClip,
-                            clipRect);
-  clipRects->setFixedClipRect(clipRect);
+  clipRects->setFixedClipRect(
+      clipRectForContext(context.treeBuilderContext.fixedPosition, effect,
+                         ancestorState, ancestorPaintOffset, hasClip));
 #ifdef CHECK_CLIP_RECTS
   CHECK(hasClip || clipRects->fixedClipRect() == oldClipRects.fixedClipRect())
       << " fixed=" << clipRects->fixedClipRect().toString();
 #endif
 
-  computeClipRectForContext(context.treeBuilderContext.absolutePosition, effect,
-                            ancestorState, ancestorPaintOffset, hasClip,
-                            clipRect);
-  clipRects->setPosClipRect(clipRect);
+  clipRects->setPosClipRect(
+      clipRectForContext(context.treeBuilderContext.absolutePosition, effect,
+                         ancestorState, ancestorPaintOffset, hasClip));
 #ifdef CHECK_CLIP_RECTS
   CHECK(!hasClip || clipRects->posClipRect() == oldClipRects.posClipRect())
       << " abs=" << clipRects->posClipRect().toString();
 #endif
 
   ClipRects* previousClipRects = paintLayer.previousPaintingClipRects();
 
   if (!previousClipRects || *clipRects != *previousClipRects) {
     paintLayer.setNeedsRepaint();
     paintLayer.setPreviousPaintPhaseDescendantOutlinesEmpty(false);
@@ skipping 64 matching lines @@
           roundedIntPoint(context->treeBuilderContext.current.paintOffset);
       walk(*toFrameView(frameViewBase), *context);
     }
     // TODO(pdr): Investigate RemoteFrameView (crbug.com/579281).
   }
 
   object.getMutableForPainting().clearPaintFlags();
 }
 
 }  // namespace blink