Prepare SVGDocumentExtensions::m_elementDependencies for oilpan

Source/core/rendering/svg/RenderSVGResource.cpp

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 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
  * version 2 of the License, or (at your option) any later version.
@@ skipping 165 matching lines @@
 
         if (RenderSVGResourceMasker* masker = resources->masker())
             masker->removeClientFromCache(object);
 
         if (RenderSVGResourceClipper* clipper = resources->clipper())
             clipper->removeClientFromCache(object);
     }
 
     if (!object->node() || !object->node()->isSVGElement())
         return;
-    HashSet<SVGElement*>* dependencies = object->document().accessSVGExtensions().setOfElementsReferencingTarget(toSVGElement(object->node()));
+    WeakSVGElementSet* dependencies = object->document().accessSVGExtensions().setOfElementsReferencingTarget(toSVGElement(object->node()));
     if (!dependencies)
         return;
 
     // We allow cycles in SVGDocumentExtensions reference sets in order to avoid expensive
     // reference graph adjustments on changes, so we need to break possible cycles here.
-    DEFINE_STATIC_LOCAL(HashSet<SVGElement*>, invalidatingDependencies, ());
+    // This strong reference is safe, as it is guaranteed that this set will be emptied
+    // at the end of recursion.
+    typedef WillBeHeapHashSet<Member<SVGElement> > SVGElementSet;

[haraken, 2014/06/09 09:33:58]

This should be WillBeHeapHashSet<RawPtrWillBeMember<SVGElement>>.

+    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<SVGElementSet>, invalidatingDependencies, (adoptPtrWillBeNoop(new SVGElementSet)));
 
-    HashSet<SVGElement*>::iterator end = dependencies->end();
-    for (HashSet<SVGElement*>::iterator it = dependencies->begin(); it != end; ++it) {
+    WeakSVGElementSet::iterator end = dependencies->end();
+    for (WeakSVGElementSet::iterator it = dependencies->begin(); it != end; ++it) {
         if (RenderObject* renderer = (*it)->renderer()) {
-            if (UNLIKELY(!invalidatingDependencies.add(*it).isNewEntry)) {
+            if (UNLIKELY(!invalidatingDependencies->add(*it).isNewEntry)) {
                 // Reference cycle: we are in process of invalidating this dependant.
                 continue;
             }
 
             RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer, needsLayout);
-            invalidatingDependencies.remove(*it);
+            invalidatingDependencies->remove(*it);
         }
     }
 }
 
 void RenderSVGResource::markForLayoutAndParentResourceInvalidation(RenderObject* object, bool needsLayout)
 {
     ASSERT(object);
     ASSERT(object->node());
 
     if (needsLayout && !object->documentBeingDestroyed())
@@ skipping 10 matching lines @@
             // This will process the rest of the ancestors.
             toRenderSVGResourceContainer(current)->removeAllClientsFromCache();
             break;
         }
 
         current = current->parent();
     }
 }
 
 }