Merge 85406

Source/WebCore/rendering/svg/RenderSVGResourceFilter.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 66 matching lines @@
         m_filter.clear();
     }
 
     markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
 }
 
 void RenderSVGResourceFilter::removeClientFromCache(RenderObject* client, bool markForInvalidation)
 {
     ASSERT(client);
 
-    if (m_filter.contains(client))
-        delete m_filter.take(client);
+    if (FilterData* filterData = m_filter.get(client)) {
+        if (filterData->savedContext)
+            filterData->markedForRemoval = true;
+        else
+            delete m_filter.take(client);
+    }
 
     markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
 }
 
 PassRefPtr<SVGFilterBuilder> RenderSVGResourceFilter::buildPrimitives(Filter* filter)
 {
     SVGFilterElement* filterElement = static_cast<SVGFilterElement*>(node());
     bool primitiveBoundingBoxMode = filterElement->primitiveUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX;
 
     // Add effects to the builder
@@ skipping 160 matching lines @@
 void RenderSVGResourceFilter::postApplyResource(RenderObject* object, GraphicsContext*& context, unsigned short resourceMode, const Path*)
 {
     ASSERT(object);
     ASSERT(context);
 #ifndef NDEBUG
     ASSERT(resourceMode == ApplyToDefaultMode);
 #else
     UNUSED_PARAM(resourceMode);
 #endif
 
-    if (!m_filter.contains(object))
+    FilterData* filterData = m_filter.get(object);
+    if (!filterData)
         return;
 
-    FilterData* filterData = m_filter.get(object);
+    if (filterData->markedForRemoval) {
+        delete m_filter.take(object);
+        return;
+    }
+
     if (!filterData->builded) {
         if (!filterData->savedContext) {
             removeClientFromCache(object);
             return;
         }
 
         context = filterData->savedContext;
         filterData->savedContext = 0;
 #if !USE(CG)
         if (filterData->sourceGraphicBuffer)
@@ skipping 65 matching lines @@
             return;
         builder->clearResultsRecursive(effect);
 
         // Repaint the image on the screen.
         markClientForInvalidation(it->first, RepaintInvalidation);
     }
 }
 
 }
 #endif