Restore resource client notifications on layout attach/detach

We still need to handle cases like when display transitions from 'none'
to not-'none' since we might need to invalidate paint properties or
similar in those cases. Unlike previously though we can just call
MarkAllClientsForInvalidation().

Remove LayoutSVGResourceClipper::WillBeDestroyed() since it should no
longer be needed.

Bug: 1162093
Change-Id: Ic0073dd10f0043e11b6ed984b57ac122a8ec37fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2614430Reviewed-by: Stephen Chenney <schenney@chromium.org>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#841504}

third_party/blink/renderer/core/layout/svg/layout_svg_resource_clipper.cc

@@ -305,11 +305,4 @@ void LayoutSVGResourceClipper::StyleDidChange(StyleDifference diff,
   }
 }
 
-void LayoutSVGResourceClipper::WillBeDestroyed() {
-  NOT_DESTROYED();
-  MarkAllClientsForInvalidation(SVGResourceClient::kClipCacheInvalidation |
-                                SVGResourceClient::kPaintInvalidation);
-  LayoutSVGResourceContainer::WillBeDestroyed();
-}
-
 }  // namespace blink

third_party/blink/renderer/core/layout/svg/layout_svg_resource_clipper.h

@@ -57,11 +57,9 @@ class LayoutSVGResourceClipper final : public LayoutSVGResourceContainer {
   base::Optional<Path> AsPath();
   sk_sp<const PaintRecord> CreatePaintRecord();
 
- protected:
+ private:
   void StyleDidChange(StyleDifference, const ComputedStyle* old_style) override;
-  void WillBeDestroyed() override;
 
- private:
   void CalculateLocalClipBounds();
   bool FindCycleFromSelf(SVGResourcesCycleSolver&) const override;
 

third_party/blink/renderer/core/layout/svg/layout_svg_resource_container.cc

@@ -55,6 +55,37 @@ void LayoutSVGResourceContainer::UpdateLayout() {
   ClearInvalidationMask();
 }
 
+void LayoutSVGResourceContainer::InvalidateClientsIfActiveResource() {
+  NOT_DESTROYED();
+  // If this is the 'active' resource (the first element with the specified 'id'
+  // in tree order), notify any clients that they need to reevaluate the
+  // resource's contents.
+  const LocalSVGResource* resource = ResourceForContainer(*this);
+  if (!resource || resource->Target() != GetElement())
+    return;
+  // Pass all available flags. This may be performing unnecessary invalidations
+  // in some cases.
+  MarkAllClientsForInvalidation(SVGResourceClient::kInvalidateAll);
+}
+
+void LayoutSVGResourceContainer::WillBeDestroyed() {
+  NOT_DESTROYED();
+  // The resource is being torn down.
+  InvalidateClientsIfActiveResource();
+  LayoutSVGHiddenContainer::WillBeDestroyed();
+}
+
+void LayoutSVGResourceContainer::StyleDidChange(
+    StyleDifference diff,
+    const ComputedStyle* old_style) {
+  NOT_DESTROYED();
+  LayoutSVGHiddenContainer::StyleDidChange(diff, old_style);
+  if (old_style)
+    return;
+  // The resource has been attached.
+  InvalidateClientsIfActiveResource();
+}
+
 bool LayoutSVGResourceContainer::FindCycle(
     SVGResourcesCycleSolver& solver) const {
   NOT_DESTROYED();

third_party/blink/renderer/core/layout/svg/layout_svg_resource_container.h

@@ -97,7 +97,12 @@ class LayoutSVGResourceContainer : public LayoutSVGHiddenContainer {
   static bool FindCycleInSubtree(SVGResourcesCycleSolver&,
                                  const LayoutObject& root);
 
+  void StyleDidChange(StyleDifference, const ComputedStyle* old_style) override;
+  void WillBeDestroyed() override;
+
  private:
+  void InvalidateClientsIfActiveResource();
+
   // Track global (markAllClientsForInvalidation) invalidations to avoid
   // redundant crawls.
   unsigned completed_invalidations_mask_ : 8;

third_party/blink/renderer/core/svg/svg_resource_client.h

@@ -28,6 +28,9 @@ class CORE_EXPORT SVGResourceClient : public GarbageCollectedMixin {
     kPaintPropertiesInvalidation = 1 << 3,
     kClipCacheInvalidation = 1 << 4,
     kFilterCacheInvalidation = 1 << 5,
+    kInvalidateAll = kLayoutInvalidation | kBoundariesInvalidation |
+                     kPaintInvalidation | kPaintPropertiesInvalidation |
+                     kClipCacheInvalidation | kFilterCacheInvalidation,
   };
   virtual void ResourceContentChanged(InvalidationModeMask) = 0;
   virtual void ResourceElementChanged() = 0;