fix: Replace ClearFilterData with InvalidateFilterData (#27699)

patches/chromium/.patches

@@ -118,4 +118,4 @@ ots_backport_maxp_sanitization.patch
 ots_backport_of_glyf_guard_access_to_maxp_version_1_field.patch
 cherry-pick-df438f22f7d2.patch
 cherry-pick-5c7ad5393f74.patch
-fix_svg_filter_data_invalidation_for_empty_containers.patch
+replace_clearfilterdata_with_invalidatefilterdata.patch

patches/chromium/fix_svg_filter_data_invalidation_for_empty_containers.patch

@@ -1,116 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fredrik=20S=C3=B6derqvist?= <[email protected]>
-Date: Tue, 1 Dec 2020 17:15:59 +0000
-Subject: Fix SVG filter data invalidation for empty containers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Empty containers will fail to create FilterData because they have an
-empty bounding box. When children were added to the container, making
-the bounding box non-empty we would fail to mark the paint properties as
-needing update because of the check for existing FilterData in
-SVGElementResourceClient::InvalidateFilterData().
-
-Instead always dispose of the filter data and mark paint properties for
-update, and use the |filter_data_dirty_| flag as an early-out check.
-
-Since we can now call InvalidateFilterData() directly in
-SVGElementResourceClient::ResourceElementChanged(), fold
-ClearFilterData() into InvalidateFilterData().
-
-Bug: 1154050
-Change-Id: I01c8ebac4f62532e2c17aabc3d998d7601dbb71b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566992
-Reviewed-by: Xianzhu Wang <[email protected]>
-Commit-Queue: Fredrik Söderquist <[email protected]>
-Cr-Commit-Position: refs/heads/master@{#832391}
-
-diff --git a/third_party/blink/renderer/core/layout/svg/svg_resources.cc b/third_party/blink/renderer/core/layout/svg/svg_resources.cc
-index f37cb5c3052d72ab15e769b29f8456e7ced9b5af..510a1ccd7f2a431184596e81dc1ac0147248bf2b 100644
---- a/third_party/blink/renderer/core/layout/svg/svg_resources.cc
-+++ b/third_party/blink/renderer/core/layout/svg/svg_resources.cc
-@@ -728,14 +728,13 @@ void SVGElementResourceClient::ResourceContentChanged(
- }
- 
- void SVGElementResourceClient::ResourceElementChanged() {
--  if (LayoutObject* layout_object = element_->GetLayoutObject()) {
--    ClearFilterData();
--    SVGResourcesCache::ResourceReferenceChanged(*layout_object);
--    // TODO(fs): If the resource element (for a filter) doesn't actually change
--    // we don't need to perform the associated invalidations.
--    layout_object->SetNeedsPaintPropertyUpdate();
--    MarkFilterDataDirty();
--  }
-+  LayoutObject* layout_object = element_->GetLayoutObject();
-+  if (!layout_object)
-+    return;
-+  // TODO(fs): If the resource element (for a filter) doesn't actually change
-+  // we don't need to perform the associated invalidations.
-+  InvalidateFilterData();
-+  SVGResourcesCache::ResourceReferenceChanged(*layout_object);
- }
- 
- void SVGElementResourceClient::ResourceDestroyed(
-@@ -808,6 +807,18 @@ bool SVGElementResourceClient::ClearFilterData() {
-   return !!filter_data;
- }
- 
-+void SVGElementResourceClient::InvalidateFilterData() {
-+  // If we performed an "optimized" invalidation via FilterPrimitiveChanged(),
-+  // we could have set |filter_data_dirty_| but not cleared |filter_data_|.
-+  if (filter_data_dirty_ && !filter_data_)
-+    return;
-+  if (FilterData* filter_data = filter_data_.Release())
-+    filter_data->Dispose();
-+  LayoutObject* layout_object = element_->GetLayoutObject();
-+  layout_object->SetNeedsPaintPropertyUpdate();
-+  MarkFilterDataDirty();
-+}
-+
- void SVGElementResourceClient::MarkFilterDataDirty() {
-   DCHECK(element_->GetLayoutObject());
-   DCHECK(element_->GetLayoutObject()->NeedsPaintPropertyUpdate());
-diff --git a/third_party/blink/renderer/core/layout/svg/svg_resources.h b/third_party/blink/renderer/core/layout/svg/svg_resources.h
-index bfe056704b698d2189e5b759040f4f6cb3c54308..a7604092baf3da06dfef5af9cd0cb4364bb00dea 100644
---- a/third_party/blink/renderer/core/layout/svg/svg_resources.h
-+++ b/third_party/blink/renderer/core/layout/svg/svg_resources.h
-@@ -229,6 +229,7 @@ class SVGElementResourceClient final
- 
-   void UpdateFilterData(CompositorFilterOperations&);
-   bool ClearFilterData();
-+  void InvalidateFilterData();
-   void MarkFilterDataDirty();
- 
-   void Trace(Visitor*) const override;
-diff --git a/third_party/blink/web_tests/external/wpt/css/filter-effects/svg-empty-container-with-filter-content-added.html b/third_party/blink/web_tests/external/wpt/css/filter-effects/svg-empty-container-with-filter-content-added.html
-new file mode 100644
-index 0000000000000000000000000000000000000000..6436461f78bc03b7b2655b7c1b114f15acfc81f9
---- /dev/null
-+++ b/third_party/blink/web_tests/external/wpt/css/filter-effects/svg-empty-container-with-filter-content-added.html
-@@ -0,0 +1,25 @@
-+<!doctype html>
-+<html class="reftest-wait">
-+<title>Adding content to a previously empty filtered container</title>
-+<link rel="help" href="https://drafts.fxtf.org/filter-effects/#FilterProperty">
-+<link rel="match" href="reference/green-100x100.html">
-+<link rel="bookmark" href="https://crbug.com/1154050">
-+<script src="/common/rendering-utils.js"></script>
-+<script src="/common/reftest-wait.js"></script>
-+<svg>
-+  <filter id="f" color-interpolation-filters="sRGB">
-+    <feComponentTransfer><feFuncA/></feComponentTransfer>
-+  </filter>
-+  <rect width="100" height="100" fill="red"/>
-+  <g id="target" filter="url(#f)"/>
-+</svg>
-+<script>
-+waitForAtLeastOneFrame().then(() => {
-+  const rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
-+  rect.setAttribute('fill', 'green');
-+  rect.setAttribute('width', '100');
-+  rect.setAttribute('height', '100');
-+  document.getElementById('target').appendChild(rect);
-+  takeScreenshot();
-+});
-+</script>

patches/chromium/replace_clearfilterdata_with_invalidatefilterdata.patch

@@ -0,0 +1,137 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Raymond Zhao <[email protected]>
+Date: Wed, 10 Feb 2021 12:03:34 -0800
+Subject: Replace ClearFilterData with InvalidateFilterData
+
+This is a hand-patch of
+https://chromium-review.googlesource.com/c/chromium/src/+/2566992,
+where the InvalidateFilterData function is from
+https://chromium-review.googlesource.com/c/chromium/src/+/2454053.
+
+Firstly, the InvalidateFilterData function was copied over.
+Then, the ClearFilterData function was deleted, and any calls to it
+were replaced with InvalidateFilterData. Redundant calls were removed.
+
+The InvalidateFilterData function in this patch contains
+a fix for SVG content sometimes failing to appear after modification
+https://bugs.chromium.org/p/chromium/issues/detail?id=1154050.
+
+diff --git a/third_party/blink/renderer/core/layout/svg/layout_svg_resource_container.cc b/third_party/blink/renderer/core/layout/svg/layout_svg_resource_container.cc
+index c7093ea1724dc99a26c3eef033d7ef13c2888f54..852eeb24ec617ae86e9aecd08bfe564445fbdca9 100644
+--- a/third_party/blink/renderer/core/layout/svg/layout_svg_resource_container.cc
++++ b/third_party/blink/renderer/core/layout/svg/layout_svg_resource_container.cc
+@@ -227,16 +227,11 @@ static inline void RemoveFromCacheAndInvalidateDependencies(
+     if (resources->HasClipOrMaskOrFilter()) {
+       InvalidationModeMask invalidation_mask =
+           SVGResourceClient::kBoundariesInvalidation;
+-      bool filter_data_invalidated = false;
+       if (resources->Filter()) {
+-        filter_data_invalidated = client->ClearFilterData();
+-        invalidation_mask |=
+-            filter_data_invalidated ? SVGResourceClient::kPaintInvalidation : 0;
++        client->InvalidateFilterData();
+       }
+       LayoutSVGResourceContainer::MarkClientForInvalidation(object,
+                                                             invalidation_mask);
+-      if (filter_data_invalidated)
+-        client->MarkFilterDataDirty();
+     }
+   }
+ 
+diff --git a/third_party/blink/renderer/core/layout/svg/svg_resources.cc b/third_party/blink/renderer/core/layout/svg/svg_resources.cc
+index f37cb5c3052d72ab15e769b29f8456e7ced9b5af..41ec00a53c1bb1c587b42f74867af4adab7e8641 100644
+--- a/third_party/blink/renderer/core/layout/svg/svg_resources.cc
++++ b/third_party/blink/renderer/core/layout/svg/svg_resources.cc
+@@ -604,12 +604,7 @@ void SVGResources::ClearClipPathFilterMask(SVGElement& element,
+     old_reference_clip->RemoveClient(*client);
+   if (style->HasFilter()) {
+     style->Filter().RemoveClient(*client);
+-    if (client->ClearFilterData()) {
+-      LayoutObject* layout_object = element.GetLayoutObject();
+-      LayoutSVGResourceContainer::MarkClientForInvalidation(
+-          *layout_object, SVGResourceClient::kPaintInvalidation);
+-      client->MarkFilterDataDirty();
+-    }
++    client->InvalidateFilterData();
+   }
+   if (StyleSVGResource* masker_resource = style->SvgStyle().MaskerResource())
+     masker_resource->RemoveClient(*client);
+@@ -712,14 +707,10 @@ void SVGElementResourceClient::ResourceContentChanged(
+     return;
+   }
+ 
+-  const bool filter_data_invalidated = ClearFilterData();
+-  if (filter_data_invalidated)
+-    invalidation_mask |= SVGResourceClient::kPaintInvalidation;
++  InvalidateFilterData();
+ 
+   LayoutSVGResourceContainer::MarkClientForInvalidation(*layout_object,
+                                                         invalidation_mask);
+-  if (filter_data_invalidated)
+-    MarkFilterDataDirty();
+ 
+   bool needs_layout =
+       invalidation_mask & SVGResourceClient::kLayoutInvalidation;
+@@ -729,12 +720,8 @@ void SVGElementResourceClient::ResourceContentChanged(
+ 
+ void SVGElementResourceClient::ResourceElementChanged() {
+   if (LayoutObject* layout_object = element_->GetLayoutObject()) {
+-    ClearFilterData();
++    InvalidateFilterData();
+     SVGResourcesCache::ResourceReferenceChanged(*layout_object);
+-    // TODO(fs): If the resource element (for a filter) doesn't actually change
+-    // we don't need to perform the associated invalidations.
+-    layout_object->SetNeedsPaintPropertyUpdate();
+-    MarkFilterDataDirty();
+   }
+ }
+ 
+@@ -801,11 +788,16 @@ void SVGElementResourceClient::UpdateFilterData(
+   filter_data_dirty_ = false;
+ }
+ 
+-bool SVGElementResourceClient::ClearFilterData() {
+-  FilterData* filter_data = filter_data_.Release();
+-  if (filter_data)
++void SVGElementResourceClient::InvalidateFilterData() {
++  // If we performed an "optimized" invalidation via FilterPrimitiveChanged(),
++  // we could have set |filter_data_dirty_| but not cleared |filter_data_|.
++  if (filter_data_dirty_ && !filter_data_)
++    return;
++  if (FilterData* filter_data = filter_data_.Release())
+     filter_data->Dispose();
+-  return !!filter_data;
++  LayoutObject* layout_object = element_->GetLayoutObject();
++  layout_object->SetNeedsPaintPropertyUpdate();
++  MarkFilterDataDirty();
+ }
+ 
+ void SVGElementResourceClient::MarkFilterDataDirty() {
+diff --git a/third_party/blink/renderer/core/layout/svg/svg_resources.h b/third_party/blink/renderer/core/layout/svg/svg_resources.h
+index bfe056704b698d2189e5b759040f4f6cb3c54308..3416de3d5e062a31a0beb2df4d7398d2d435ec6a 100644
+--- a/third_party/blink/renderer/core/layout/svg/svg_resources.h
++++ b/third_party/blink/renderer/core/layout/svg/svg_resources.h
+@@ -228,7 +228,7 @@ class SVGElementResourceClient final
+                               const QualifiedName& attribute) override;
+ 
+   void UpdateFilterData(CompositorFilterOperations&);
+-  bool ClearFilterData();
++  void InvalidateFilterData();
+   void MarkFilterDataDirty();
+ 
+   void Trace(Visitor*) const override;
+diff --git a/third_party/blink/renderer/core/layout/svg/svg_resources_cache.cc b/third_party/blink/renderer/core/layout/svg/svg_resources_cache.cc
+index b9aea888de151de41591ec9fd76ef4a3c0f4b017..6fa6ee6eb18f049603c5fc177a53c772239761cc 100644
+--- a/third_party/blink/renderer/core/layout/svg/svg_resources_cache.cc
++++ b/third_party/blink/renderer/core/layout/svg/svg_resources_cache.cc
+@@ -99,9 +99,7 @@ void SVGResourcesCache::ClientLayoutChanged(LayoutObject& object) {
+     invalidation_flags = SVGResourceClient::kBoundariesInvalidation;
+   bool filter_data_invalidated = false;
+   if (resources->Filter()) {
+-    filter_data_invalidated = client->ClearFilterData();
+-    invalidation_flags |=
+-        filter_data_invalidated ? SVGResourceClient::kPaintInvalidation : 0;
++    client->InvalidateFilterData();
+   }
+   if (LayoutSVGResourcePaintServer* fill = resources->Fill()) {
+     fill->RemoveClientFromCache(*client);