Prepare SVGDocumentExtensions::m_elementDependencies for oilpan

Source/core/svg/SVGDocumentExtensions.h

 /*
  * Copyright (C) 2006 Apple Inc. All rights reserved.
  * Copyright (C) 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 24 matching lines @@
 class SubtreeLayoutScope;
 class SVGElement;
 #if ENABLE(SVG_FONTS)
 class SVGFontFaceElement;
 #endif
 class SVGResourcesCache;
 class SVGSMILElement;
 class SVGSVGElement;
 class Element;
 
+typedef WillBeHeapHashSet<RawPtrWillBeMember<SVGElement> > SVGElementSet;
+
 class SVGDocumentExtensions : public NoBaseWillBeGarbageCollectedFinalized<SVGDocumentExtensions> {
     WTF_MAKE_NONCOPYABLE(SVGDocumentExtensions); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     typedef HashSet<Element*> SVGPendingElements;
     explicit SVGDocumentExtensions(Document*);
     ~SVGDocumentExtensions();
 
     void addTimeContainer(SVGSVGElement*);
     void removeTimeContainer(SVGSVGElement*);
 
     void addResource(const AtomicString& id, RenderSVGResourceContainer*);
     void removeResource(const AtomicString& id);
     RenderSVGResourceContainer* resourceById(const AtomicString& id) const;
 
     static void serviceOnAnimationFrame(Document&, double monotonicAnimationStartTime);
 
     void startAnimations();
     void pauseAnimations();
     void dispatchSVGLoadEventToOutermostSVGElements();
 
     void reportWarning(const String&);
     void reportError(const String&);
 
     SVGResourcesCache* resourcesCache() const { return m_resourcesCache.get(); }
 
-    HashSet<SVGElement*>* setOfElementsReferencingTarget(SVGElement* referencedElement) const;
+    SVGElementSet* setOfElementsReferencingTarget(SVGElement* referencedElement) const;
     void addElementReferencingTarget(SVGElement* referencingElement, SVGElement* referencedElement);
     void removeAllTargetReferencesForElement(SVGElement*);
     void rebuildAllElementReferencesForTarget(SVGElement*);
     void removeAllElementReferencesForTarget(SVGElement*);
 
     void addSVGRootWithRelativeLengthDescendents(SVGSVGElement*);
     void removeSVGRootWithRelativeLengthDescendents(SVGSVGElement*);
     bool isSVGRootWithRelativeLengthDescendents(SVGSVGElement*) const;
     void invalidateSVGRootsWithRelativeLengthDescendents(SubtreeLayoutScope*);
 
@@ skipping 10 matching lines @@
 
     void startPan(const FloatPoint& start);
     void updatePan(const FloatPoint& pos) const;
 
     static SVGSVGElement* rootElement(const Document&);
     SVGSVGElement* rootElement() const;
 
     void trace(Visitor*);
 
 private:
-    Document* m_document; // weak reference
+    RawPtrWillBeMember<Document> m_document;
     WillBeHeapHashSet<RawPtrWillBeMember<SVGSVGElement> > m_timeContainers; // For SVG 1.2 support this will need to be made more general.
 #if ENABLE(SVG_FONTS)
     WillBeHeapHashSet<RawPtrWillBeMember<SVGFontFaceElement> > m_svgFontFaceElements;
     // SVGFontFaceElements that are pending and scheduled for removal.
     WillBeHeapHashSet<RefPtrWillBeMember<SVGFontFaceElement> > m_pendingSVGFontFaceElementsForRemoval;
 #endif
     HashMap<AtomicString, RenderSVGResourceContainer*> m_resources;
     HashMap<AtomicString, OwnPtr<SVGPendingElements> > m_pendingResources; // Resources that are pending.
     HashMap<AtomicString, OwnPtr<SVGPendingElements> > m_pendingResourcesForRemoval; // Resources that are pending and scheduled for removal.
-    HashMap<SVGElement*, OwnPtr<HashSet<SVGElement*> > > m_elementDependencies;
+    typedef WillBeHeapHashMap<RawPtrWillBeMember<SVGElement>, OwnPtrWillBeMember<SVGElementSet> > ElementDependenciesMap;
+    OwnPtrWillBeMember<ElementDependenciesMap> m_elementDependencies;

[haraken, 2014/06/10 08:48:19]

I wonder why you need to make this an OwnPtrWillBeMember. Doesn't
ElementDependenciesMap work?

[kouhei (in TOK), 2014/06/10 08:58:59]

Done.

     OwnPtr<SVGResourcesCache> m_resourcesCache;
+
+    // FIXME: Oilpan: make below HeapHashSet<WeakMember<SVGSVGElement> >

[haraken, 2014/06/10 08:48:19]

I don't fully understand why this needs to be weak. Given that SVGSVGElements in
this hash set die together with the document, can we use a strong Member for
this?

[kouhei (in TOK), 2014/06/10 08:58:59]

This change was made in https://codereview.chromium.org/323803002/ and this was
landed as a strong ref.

     HashSet<SVGSVGElement*> m_relativeLengthSVGRoots; // Root SVG elements with relative length descendants.
     FloatPoint m_translate;
 #if !ASSERT_DISABLED
     bool m_inRelativeLengthSVGRootsInvalidation;
 #endif
 
 public:
     // This HashMap contains a list of pending resources. Pending resources, are such
     // which are referenced by any object in the SVG document, but do NOT exist yet.
     // For instance, dynamically build gradients / patterns / clippers...
@@ skipping 11 matching lines @@
     void markPendingResourcesForRemoval(const AtomicString&);
     Element* removeElementFromPendingResourcesForRemoval(const AtomicString&);
 
 private:
     PassOwnPtr<SVGPendingElements> removePendingResourceForRemoval(const AtomicString&);
 };
 
 }
 
 #endif