Oilpan: move SVG property hierarchy to the heap.

Source/core/rendering/svg/RenderSVGResourceFilter.h

 /*
  * 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 13 matching lines @@
 #ifndef RenderSVGResourceFilter_h
 #define RenderSVGResourceFilter_h
 
 #include "core/rendering/svg/RenderSVGResourceContainer.h"
 #include "core/svg/SVGFilterElement.h"
 #include "core/svg/graphics/filters/SVGFilter.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
 
 namespace blink {
 
-struct FilterData {
-    WTF_MAKE_FAST_ALLOCATED;
+class FilterData final : public NoBaseWillBeGarbageCollected<FilterData> {
+    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     enum FilterDataState { PaintingSource, Built, CycleDetected };
 
+    static PassOwnPtrWillBeRawPtr<FilterData> create()
+    {
+        return adoptPtrWillBeNoop(new FilterData());
+    }
+
+    void trace(Visitor*);
+
+    RefPtrWillBeMember<SVGFilter> filter;
+    RefPtrWillBeMember<SVGFilterBuilder> builder;
+    FloatRect boundaries;
+    FloatRect drawingRegion;
+    FilterDataState state;
+
+private:
     FilterData()
         : state(PaintingSource)
     {
     }
 
-    RefPtr<SVGFilter> filter;
-    RefPtr<SVGFilterBuilder> builder;
-    FloatRect boundaries;
-    FloatRect drawingRegion;
-    FilterDataState state;
 };
 
 class GraphicsContext;
 
 class RenderSVGResourceFilter final : public RenderSVGResourceContainer {
 public:
     explicit RenderSVGResourceFilter(SVGFilterElement*);
+
     virtual ~RenderSVGResourceFilter();
+    virtual void trace(Visitor*) override;
     virtual void destroy() override;
 
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
 
     virtual const char* renderName() const override { return "RenderSVGResourceFilter"; }
     virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectSVGResourceFilter || RenderSVGResourceContainer::isOfType(type); }
 
     virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
     virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true) override;
 
     bool prepareEffect(RenderObject*, GraphicsContext*&);
     void finishEffect(RenderObject*, GraphicsContext*&);
 
     FloatRect resourceBoundingBox(const RenderObject*);
 
-    PassRefPtr<SVGFilterBuilder> buildPrimitives(SVGFilter*);
+    PassRefPtrWillBeRawPtr<SVGFilterBuilder> buildPrimitives(SVGFilter*);
 
     SVGUnitTypes::SVGUnitType filterUnits() const { return toSVGFilterElement(element())->filterUnits()->currentValue()->enumValue(); }
     SVGUnitTypes::SVGUnitType primitiveUnits() const { return toSVGFilterElement(element())->primitiveUnits()->currentValue()->enumValue(); }
 
     void primitiveAttributeChanged(RenderObject*, const QualifiedName&);
 
     virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
     static const RenderSVGResourceType s_resourceType;
 
     FloatRect drawingRegion(RenderObject*) const;
 private:
-    typedef HashMap<RenderObject*, OwnPtr<FilterData> > FilterMap;
+    typedef WillBeHeapHashMap<RenderObject*, OwnPtrWillBeMember<FilterData> > FilterMap;

[haraken, 2014/11/11 05:22:46]

RenderObject* => RawPtrWillBeMember<RenderObject> ?

[sof, 2014/11/12 13:45:07]

Done, a safe change wrt lifetime. Also tidied up the stack allocated
SVGRenderingContext (which refers to RenderSVGResourceFilter) while at it.

     FilterMap m_filter;
 };
 
 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderSVGResourceFilter, isSVGResourceFilter());
 
 }
 
 #endif