Reuse cc::PictureLayers when possible for SPv2.

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 35 matching lines @@
     FloatRect rect = localRect;
     if (object.isBox())
         toLayoutBox(object).flipForWritingMode(rect);
 
     LayoutRect result;
     if (context.forcedSubtreeInvalidationFlags & PaintInvalidatorContext::ForcedSubtreeSlowPathRect) {
         result = slowMapToVisualRectInAncestorSpace(object, *context.paintInvalidationContainer, rect);
     } else if (object == context.paintInvalidationContainer) {
         result = LayoutRect(rect);
     } else {
+        rect.moveBy(FloatPoint(context.treeBuilderContext.current.paintOffset));
+
+        // In SPv2, visual rects are in the space of their local transform node.
+        if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+            return LayoutRect(rect);
+
         GeometryPropertyTreeState currentTreeState(context.treeBuilderContext.current.transform, context.treeBuilderContext.current.clip, context.treeBuilderContext.currentEffect);
         GeometryPropertyTreeState containerTreeState;
         const ObjectPaintProperties* containerPaintProperties = context.paintInvalidationContainer->objectPaintProperties();
         containerPaintProperties->getContentsProperties(containerTreeState);
 
-        rect.moveBy(FloatPoint(context.treeBuilderContext.current.paintOffset));
         bool success = false;
         result = LayoutRect(geometryMapper.mapToVisualRectInDestinationSpace(rect, currentTreeState, containerTreeState, success));
         DCHECK(success);
         result.moveBy(-containerPaintProperties->localBorderBoxProperties()->paintOffset);
     }
 
     if (context.paintInvalidationContainer->layer()->groupedMapping())
         PaintLayer::mapRectInPaintInvalidationContainerToBacking(*context.paintInvalidationContainer, result);
     return result;
 }
@@ skipping 213 matching lines @@
     object.getMutableForPainting().clearPaintInvalidationFlags();
 }
 
 void PaintInvalidator::processPendingDelayedPaintInvalidations()
 {
     for (auto target : m_pendingDelayedPaintInvalidations)
         target->getMutableForPainting().setShouldDoFullPaintInvalidation(PaintInvalidationDelayedFull);
 }
 
 } // namespace blink