[SPv2] Associate effect property nodes for SVG paint chunks

third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.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/PaintPropertyTreeBuilder.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutInline.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/compositing/CompositingReasonFinder.h"
 #include "core/layout/svg/LayoutSVGRoot.h"
+#include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/paint/FindPropertiesNeedingUpdate.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/SVGRootPainter.h"
 #include "platform/transforms/TransformationMatrix.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
@@ skipping 361 matching lines @@
       context.current.shouldFlattenInheritedTransform = true;
     }
   }
 }
 
 void PaintPropertyTreeBuilder::updateEffect(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   const ComputedStyle& style = object.styleRef();
 
-  // TODO(crbug.com/673500): style.isStackingContext() is only meaningful for
-  // HTML elements. What we really want to ask is whether the element starts
-  // an isolated group, and SVGs use a different rule.
-  if (!style.isStackingContext()) {
+  const bool isCSSIsolatedGroup =
+      object.isBoxModelObject() && style.isStackingContext();
+  const bool isSVGExceptRoot = object.isSVG() && !object.isSVGRoot();
+  if (!isCSSIsolatedGroup && !isSVGExceptRoot) {
     if (object.needsPaintPropertyUpdate() || context.forceSubtreeUpdate) {
       if (auto* properties = object.getMutableForPainting().paintProperties())
         context.forceSubtreeUpdate |= properties->clearEffect();
     }
     return;
   }
 
   // TODO(trchen): Can't omit effect node if we have 3D children.
   if (object.needsPaintPropertyUpdate() || context.forceSubtreeUpdate) {
     bool effectNodeNeeded = false;
 
     // Can't omit effect node if we have paint children with exotic blending.
     if (object.isSVG()) {
       // Yes, including LayoutSVGRoot, because SVG layout objects don't create
       // PaintLayer so PaintLayer::hasNonIsolatedDescendantWithBlendMode()
       // doesn't catch SVG descendants.
-      if (object.hasNonIsolatedBlendingDescendants())
+      if (SVGLayoutSupport::isIsolationRequired(&object))
         effectNodeNeeded = true;
     } else if (PaintLayer* layer = toLayoutBoxModelObject(object).layer()) {
       if (layer->hasNonIsolatedDescendantWithBlendMode())
         effectNodeNeeded = true;
     }
 
-    SkBlendMode blendMode =
-        WebCoreCompositeToSkiaComposite(CompositeSourceOver, style.blendMode());
+    SkBlendMode blendMode = object.isBlendingAllowed()
+                                ? WebCoreCompositeToSkiaComposite(
+                                      CompositeSourceOver, style.blendMode())
+                                : SkBlendMode::kSrcOver;
     if (blendMode != SkBlendMode::kSrcOver)
       effectNodeNeeded = true;
 
     float opacity = style.opacity();
     if (opacity != 1.0f)
       effectNodeNeeded = true;
 
     CompositorFilterOperations filter;
     if (object.isSVG() && !object.isSVGRoot()) {
       // TODO(trchen): SVG caches filters in SVGResources. Implement it.
@@ skipping 518 matching lines @@
 #endif
 
   updateOverflowClip(object, context);
   updatePerspective(object, context);
   updateSvgLocalToBorderBoxTransform(object, context);
   updateScrollAndScrollTranslation(object, context);
   updateOutOfFlowContext(object, context);
 }
 
 }  // namespace blink