Proactively dispose image filters for SVG filter chains

third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceFilter.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
  * Copyright (C) 2005 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 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
  * License as published by the Free Software Foundation; either
@@ skipping 18 matching lines @@
 
 namespace blink {
 
 DEFINE_TRACE(FilterData) {
   visitor->Trace(last_effect);
   visitor->Trace(node_map);
 }
 
 void FilterData::Dispose() {
   node_map = nullptr;
+  if (last_effect)
+    last_effect->DisposeImageFiltersRecursive();
   last_effect = nullptr;
 }
 
 LayoutSVGResourceFilter::LayoutSVGResourceFilter(SVGFilterElement* node)
     : LayoutSVGResourceContainer(node) {}
 
 LayoutSVGResourceFilter::~LayoutSVGResourceFilter() {}
 
 void LayoutSVGResourceFilter::DisposeFilterMap() {
-  for (auto& filter : filter_)
-    filter.value->Dispose();
+  for (auto& entry : filter_)
+    entry.value->Dispose();
   filter_.clear();
 }
 
 void LayoutSVGResourceFilter::WillBeDestroyed() {
   DisposeFilterMap();
   LayoutSVGResourceContainer::WillBeDestroyed();
 }
 
 bool LayoutSVGResourceFilter::IsChildAllowed(LayoutObject* child,
                                              const ComputedStyle&) const {
   return child->IsSVGResourceFilterPrimitive();
 }
 
 void LayoutSVGResourceFilter::RemoveAllClientsFromCache(
     bool mark_for_invalidation) {
   // LayoutSVGResourceFilter::removeClientFromCache will be called for
   // all clients through markAllClientsForInvalidation so no explicit
   // display item invalidation is needed here.
   DisposeFilterMap();
   MarkAllClientsForInvalidation(mark_for_invalidation
                                     ? kLayoutAndBoundariesInvalidation
                                     : kParentOnlyInvalidation);
 }
 
 void LayoutSVGResourceFilter::RemoveClientFromCache(
     LayoutObject* client,
     bool mark_for_invalidation) {
   DCHECK(client);
 
-  bool filter_cached = filter_.Contains(client);
-  if (filter_cached)
-    filter_.erase(client);
+  auto entry = filter_.find(client);
+  bool filter_cached = entry != filter_.end();
+  if (filter_cached) {
+    entry->value->Dispose();
+    filter_.erase(entry);
+  }
 
   // If the filter has a cached subtree, invalidate the associated display item.
   if (mark_for_invalidation && filter_cached)
     MarkClientForInvalidation(client, kPaintInvalidation);
 
   MarkClientForInvalidation(client, mark_for_invalidation
                                         ? kBoundariesInvalidation
                                         : kParentOnlyInvalidation);
 }
 
@@ skipping 42 matching lines @@
       return;
     node_map->InvalidateDependentEffects(effect);
 
     // Issue paint invalidations for the image on the screen.
     MarkClientForInvalidation(filter.key, kPaintInvalidation);
   }
   NotifyContentChanged();
 }
 
 }  // namespace blink