Oilpan: move SVG property hierarchy to the heap.

Source/core/svg/graphics/filters/SVGFilterBuilder.h

 /*
  * Copyright (C) 2008 Alex Mathews <possessedpenguinbob@gmail.com>
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef SVGFilterBuilder_h
 #define SVGFilterBuilder_h
 
 #include "platform/graphics/filters/FilterEffect.h"
+#include "platform/heap/Handle.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/text/AtomicStringHash.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class RenderObject;
 
-class SVGFilterBuilder : public RefCounted<SVGFilterBuilder> {
+class SVGFilterBuilder final : public RefCountedWillBeGarbageCollectedFinalized<SVGFilterBuilder> {
 public:
-    typedef HashSet<FilterEffect*> FilterEffectSet;
+    typedef WillBeHeapHashSet<RawPtrWillBeMember<FilterEffect> > FilterEffectSet;
 
-    static PassRefPtr<SVGFilterBuilder> create(PassRefPtr<FilterEffect> sourceGraphic, PassRefPtr<FilterEffect> sourceAlpha) { return adoptRef(new SVGFilterBuilder(sourceGraphic, sourceAlpha)); }
+    static PassRefPtrWillBeRawPtr<SVGFilterBuilder> create(PassRefPtrWillBeRawPtr<FilterEffect> sourceGraphic, PassRefPtrWillBeRawPtr<FilterEffect> sourceAlpha)
+    {
+        return adoptRefWillBeNoop(new SVGFilterBuilder(sourceGraphic, sourceAlpha));
+    }
 
-    void add(const AtomicString& id, PassRefPtr<FilterEffect>);
+    void add(const AtomicString& id, PassRefPtrWillBeRawPtr<FilterEffect>);
 
     FilterEffect* getEffectById(const AtomicString& id) const;
     FilterEffect* lastEffect() const { return m_lastEffect.get(); }
 
-    void appendEffectToEffectReferences(PassRefPtr<FilterEffect>, RenderObject*);
+    void appendEffectToEffectReferences(PassRefPtrWillBeRawPtr<FilterEffect>, RenderObject*);
 
     inline FilterEffectSet& effectReferences(FilterEffect* effect)
     {
         // Only allowed for effects belongs to this builder.
         ASSERT(m_effectReferences.contains(effect));
         return m_effectReferences.find(effect)->value;
     }
 
     // Required to change the attributes of a filter during an svgAttributeChanged.
     inline FilterEffect* effectByRenderer(RenderObject* object) { return m_effectRenderer.get(object); }
 
     void clearEffects();
     void clearResultsRecursive(FilterEffect*);
 
+    void trace(Visitor*);
+
 private:
-    SVGFilterBuilder(PassRefPtr<FilterEffect> sourceGraphic, PassRefPtr<FilterEffect> sourceAlpha);
+    SVGFilterBuilder(PassRefPtrWillBeRawPtr<FilterEffect> sourceGraphic, PassRefPtrWillBeRawPtr<FilterEffect> sourceAlpha);
 
     inline void addBuiltinEffects()
     {
-        HashMap<AtomicString, RefPtr<FilterEffect> >::iterator end = m_builtinEffects.end();
-        for (HashMap<AtomicString, RefPtr<FilterEffect> >::iterator iterator = m_builtinEffects.begin(); iterator != end; ++iterator)
+        NamedFilterEffectMap::iterator end = m_builtinEffects.end();
+        for (NamedFilterEffectMap::iterator iterator = m_builtinEffects.begin(); iterator != end; ++iterator)
              m_effectReferences.add(iterator->value, FilterEffectSet());
     }
 
-    HashMap<AtomicString, RefPtr<FilterEffect> > m_builtinEffects;
-    HashMap<AtomicString, RefPtr<FilterEffect> > m_namedEffects;
+    typedef WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<FilterEffect> > NamedFilterEffectMap;
+
+    NamedFilterEffectMap m_builtinEffects;
+    NamedFilterEffectMap m_namedEffects;
     // The value is a list, which contains those filter effects,
     // which depends on the key filter effect.
-    HashMap<RefPtr<FilterEffect>, FilterEffectSet> m_effectReferences;
-    HashMap<RenderObject*, FilterEffect*> m_effectRenderer;
+    WillBeHeapHashMap<RefPtrWillBeMember<FilterEffect>, FilterEffectSet> m_effectReferences;
+    WillBeHeapHashMap<RenderObject*, RawPtrWillBeMember<FilterEffect> > m_effectRenderer;
 
-    RefPtr<FilterEffect> m_lastEffect;
+    RefPtrWillBeMember<FilterEffect> m_lastEffect;
 };
 
 } // namespace blink
 
 #endif // SVGFilterBuilder_h