[SPv2] Associate effect property nodes for SVG paint chunks

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

 /*
  * Copyright (C) 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.  All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 43 matching lines @@
                ->masker() == m_masker);
     SVGMaskPainter(*m_masker).finishEffect(m_object, paintInfo().context);
   }
 }
 
 bool SVGPaintContext::applyClipMaskAndFilterIfNecessary() {
 #if ENABLE(ASSERT)
   DCHECK(!m_applyClipMaskAndFilterIfNecessaryCalled);
   m_applyClipMaskAndFilterIfNecessaryCalled = true;
 #endif
+  // In SPv2 we should early exit once the paint property state has been
+  // applied, because all meta (non-drawing) display items are ignored in
+  // SPv2. However we can't simply omit them because there are still
+  // non-composited painting (e.g. SVG filters in particular) that rely on
+  // these meta display items.
+  applyPaintPropertyState();
 
   // When rendering clip paths as masks, only geometric operations should be
   // included so skip non-geometric operations such as compositing, masking, and
   // filtering.
   if (paintInfo().isRenderingClipPathAsMaskImage()) {
     DCHECK(!m_object.isSVGRoot());
     applyClipIfNecessary();
     return true;
   }
 
@@ skipping 27 matching lines @@
 
   if (!isIsolationInstalled() &&
       SVGLayoutSupport::isIsolationRequired(&m_object)) {
     m_compositingRecorder = WTF::wrapUnique(new CompositingRecorder(
         paintInfo().context, m_object, SkBlendMode::kSrcOver, 1));
   }
 
   return true;
 }
 
+void SVGPaintContext::applyPaintPropertyState() {
+  if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+    return;
+
+  // SVGRoot works like normal CSS replaced element and its effects are
+  // applied as stacking context effect by PaintLayerPainter.
+  if (m_object.isSVGRoot())
+    return;
+
+  const auto* paintProperties = m_object.paintProperties();
+  const EffectPaintPropertyNode* effect =
+      paintProperties ? paintProperties->effect() : nullptr;
+  if (!effect)
+    return;
+
+  auto& paintController = paintInfo().context.getPaintController();
+  PaintChunkProperties properties(
+      paintController.currentPaintChunkProperties());
+  properties.propertyTreeState.setEffect(effect);
+  m_scopedPaintChunkProperties.emplace(paintController, m_object, properties);
+}
+
 void SVGPaintContext::applyCompositingIfNecessary() {
   DCHECK(!paintInfo().isRenderingClipPathAsMaskImage());
 
   const ComputedStyle& style = m_object.styleRef();
   float opacity = style.opacity();
   WebBlendMode blendMode = style.hasBlendMode() && m_object.isBlendingAllowed()
                                ? style.blendMode()
                                : WebBlendModeNormal;
   if (opacity < 1 || blendMode != WebBlendModeNormal) {
     const FloatRect compositingBounds =
@@ skipping 120 matching lines @@
   // though.
   // Additionally, it's not really safe/guaranteed to be correct, as
   // something down the paint pipe may want to farther tweak the color
   // filter, which could yield incorrect results. (Consider just using
   // saveLayer() w/ this color filter explicitly instead.)
   paint.setColorFilter(sk_ref_sp(paintInfo.context.getColorFilter()));
   return true;
 }
 
 }  // namespace blink