Re-implement SVG transform paint property nodes [spv2]

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

 // Copyright 2014 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/SVGShapePainter.h"
 
 #include "core/layout/svg/LayoutSVGResourceMarker.h"
 #include "core/layout/svg/LayoutSVGShape.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/layout/svg/SVGMarkerData.h"
 #include "core/layout/svg/SVGResources.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "core/paint/FloatClipRecorder.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
+#include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/ObjectPainter.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/SVGContainerPainter.h"
 #include "core/paint/SVGPaintContext.h"
 #include "core/paint/TransformRecorder.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
+#include "platform/graphics/paint/ScopedPaintChunkProperties.h"
 #include "platform/graphics/paint/SkPictureBuilder.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "wtf/Optional.h"
 
 namespace blink {
 
 static bool setupNonScalingStrokeContext(AffineTransform& strokeTransform, GraphicsContextStateSaver& stateSaver)
 {
     if (!strokeTransform.isInvertible())
@@ skipping 14 matching lines @@
     if (paintInfo.phase != PaintPhaseForeground
         || m_layoutSVGShape.style()->visibility() == HIDDEN
         || m_layoutSVGShape.isShapeEmpty())
         return;
 
     FloatRect boundingBox = m_layoutSVGShape.paintInvalidationRectInLocalSVGCoordinates();
     if (!paintInfo.cullRect().intersectsCullRect(m_layoutSVGShape.localSVGTransform(), boundingBox))
         return;
 
     PaintInfo paintInfoBeforeFiltering(paintInfo);
+
+    // FIXME(pdr): Extract this out and use it in all non-root SVG painters.

[jbroman, 2016/06/09 22:16:49]

TODO, not FIXME (also below). Why have you traveled back in time to WebKit
style? ;)

https://www.chromium.org/blink/coding-style

[pdr., 2016/06/09 23:39:04]

WTF::ShameCube(pdr)

We should add a presubmit script to catch this.

In any case, I've removed this code as it really belongs in the followup patch
(https://codereview.chromium.org/2059433002/) and wasn't needed here.

+    Optional<ScopedPaintChunkProperties> propertyScope;
+    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+        const auto* objectProperties = m_layoutSVGShape.objectPaintProperties();
+        if (objectProperties && objectProperties->transform()) {
+            auto& paintController = paintInfoBeforeFiltering.context.getPaintController();
+            PaintChunkProperties properties(paintController.currentPaintChunkProperties());
+            // FIXME(pdr): Include other properties such as effects and clips too.
+            properties.transform = objectProperties->transform();
+            propertyScope.emplace(paintController, properties);
+        }
+    }
+
     // Shapes cannot have children so do not call updateCullRect.
     TransformRecorder transformRecorder(paintInfoBeforeFiltering.context, m_layoutSVGShape, m_layoutSVGShape.localSVGTransform());
     {
         SVGPaintContext paintContext(m_layoutSVGShape, paintInfoBeforeFiltering);
         if (paintContext.applyClipMaskAndFilterIfNecessary() && !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(paintContext.paintInfo().context, m_layoutSVGShape, paintContext.paintInfo().phase)) {
             LayoutObjectDrawingRecorder recorder(paintContext.paintInfo().context, m_layoutSVGShape, paintContext.paintInfo().phase, boundingBox);
             const SVGComputedStyle& svgStyle = m_layoutSVGShape.style()->svgStyle();
 
             bool shouldAntiAlias = svgStyle.shapeRendering() != SR_CRISPEDGES && svgStyle.shapeRendering() != SR_OPTIMIZESPEED;
 
@@ skipping 150 matching lines @@
         return;
 
     TransformRecorder transformRecorder(paintInfo.context, marker, marker.markerTransformation(position.origin, position.angle, strokeWidth));
     Optional<FloatClipRecorder> clipRecorder;
     if (SVGLayoutSupport::isOverflowHidden(&marker))
         clipRecorder.emplace(paintInfo.context, marker, paintInfo.phase, marker.viewport());
     SVGContainerPainter(marker).paint(paintInfo);
 }
 
 } // namespace blink