Oilpan: promptly release FilterData on LayoutSVGResourceFilter destruction

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 23 matching lines @@
 namespace blink {
 
 DEFINE_TRACE(FilterData)
 {
 #if ENABLE(OILPAN)
     visitor->trace(filter);
     visitor->trace(builder);
 #endif
 }
 
+void FilterData::dispose()
+{
+    m_context.clear();
+    m_displayItemList.clear();
+    builder = nullptr;
+    filter = nullptr;
+}
+
 LayoutSVGResourceFilter::LayoutSVGResourceFilter(SVGFilterElement* node)
     : LayoutSVGResourceContainer(node)
 {
 }
 
 LayoutSVGResourceFilter::~LayoutSVGResourceFilter()
 {
 }
 
+void LayoutSVGResourceFilter::disposeFilterMap()
+{
+#if ENABLE(OILPAN)
+    for (auto& filter : m_filter)
+        filter.value->dispose();
+#endif
+    m_filter.clear();
+}
+
 void LayoutSVGResourceFilter::destroy()
 {
-    m_filter.clear();
+    disposeFilterMap();
     LayoutSVGResourceContainer::destroy();
 }
 
 bool LayoutSVGResourceFilter::isChildAllowed(LayoutObject* child, const LayoutStyle&) const
 {
     return child->isSVGResourceFilterPrimitive();
 }
 
 void LayoutSVGResourceFilter::removeAllClientsFromCache(bool markForInvalidation)
 {
-    m_filter.clear();
+    disposeFilterMap();
     markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
 }
 
 void LayoutSVGResourceFilter::removeClientFromCache(LayoutObject* client, bool markForInvalidation)
 {
     ASSERT(client);
 
     m_filter.remove(client);
 
     markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
@@ skipping 31 matching lines @@
     if (SVGFilterElement* element = toSVGFilterElement(this->element()))
         return SVGLengthContext::resolveRectangle<SVGFilterElement>(element, element->filterUnits()->currentValue()->enumValue(), object->objectBoundingBox());
 
     return FloatRect();
 }
 
 void LayoutSVGResourceFilter::primitiveAttributeChanged(LayoutObject* object, const QualifiedName& attribute)
 {
     FilterMap::iterator it = m_filter.begin();
     FilterMap::iterator end = m_filter.end();
-    SVGFilterPrimitiveStandardAttributes* primitve = static_cast<SVGFilterPrimitiveStandardAttributes*>(object->node());
+    SVGFilterPrimitiveStandardAttributes* primitive = static_cast<SVGFilterPrimitiveStandardAttributes*>(object->node());
 
     for (; it != end; ++it) {
         FilterData* filterData = it->value.get();
         if (filterData->m_state != FilterData::ReadyToPaint)
             continue;
 
         SVGFilterBuilder* builder = filterData->builder.get();
         FilterEffect* effect = builder->effectByRenderer(object);
         if (!effect)
             continue;
         // Since all effects shares the same attribute value, all
         // or none of them will be changed.
-        if (!primitve->setFilterEffectAttribute(effect, attribute))
+        if (!primitive->setFilterEffectAttribute(effect, attribute))
             return;
         builder->clearResultsRecursive(effect);
 
         // Issue paint invalidations for the image on the screen.
         markClientForInvalidation(it->key, PaintInvalidation);
     }
     markAllClientLayersForInvalidation();
 }
 
-}
+} // namespace blink