Oilpan: move SVG property hierarchy to the heap.

Source/core/svg/properties/SVGAnimatedProperty.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
 G*     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #ifndef SVGAnimatedProperty_h
 #define SVGAnimatedProperty_h
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/svg/SVGParsingError.h"
 #include "core/svg/properties/SVGPropertyInfo.h"
 #include "core/svg/properties/SVGPropertyTearOff.h"
+#include "platform/heap/Handle.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 
 namespace blink {
 
 class SVGElement;
 
-class SVGAnimatedPropertyBase : public RefCounted<SVGAnimatedPropertyBase>, public ScriptWrappableBase {
+class SVGAnimatedPropertyBase : public RefCountedWillBeGarbageCollectedFinalized<SVGAnimatedPropertyBase>, public ScriptWrappableBase {
+    WTF_MAKE_NONCOPYABLE(SVGAnimatedPropertyBase);
 public:
     virtual ~SVGAnimatedPropertyBase();
 
     virtual SVGPropertyBase* currentValueBase() = 0;
     virtual bool isAnimating() const = 0;
 
-    virtual PassRefPtr<SVGPropertyBase> createAnimatedValue() = 0;
-    virtual void setAnimatedValue(PassRefPtr<SVGPropertyBase>) = 0;
+    virtual PassRefPtrWillBeRawPtr<SVGPropertyBase> createAnimatedValue() = 0;
+    virtual void setAnimatedValue(PassRefPtrWillBeRawPtr<SVGPropertyBase>) = 0;
     virtual void animationEnded();
 
     virtual void setBaseValueAsString(const String& value, SVGParsingError& parseError) = 0;
     virtual bool needsSynchronizeAttribute() = 0;
     virtual void synchronizeAttribute();
 
     AnimatedPropertyType type() const
     {
         return m_type;
     }
@@ skipping 13 matching lines @@
         return m_isReadOnly;
     }
 
     void setReadOnly()
     {
         m_isReadOnly = true;
     }
 
     bool isSpecified() const;
 
+    virtual void trace(Visitor* visitor)
+    {
+        visitor->trace(m_contextElement);
+    }
+
 protected:
     SVGAnimatedPropertyBase(AnimatedPropertyType, SVGElement*, const QualifiedName& attributeName);
 
 private:
     const AnimatedPropertyType m_type;
     bool m_isReadOnly;
 
     // This reference is kept alive from V8 wrapper
-    SVGElement* m_contextElement;
+    RawPtrWillBeMember<SVGElement> m_contextElement;
 
     const QualifiedName& m_attributeName;
-
-    WTF_MAKE_NONCOPYABLE(SVGAnimatedPropertyBase);
 };
 
 template <typename Property>
 class SVGAnimatedPropertyCommon : public SVGAnimatedPropertyBase {
 public:
     Property* baseValue()
     {
         return m_baseValue.get();
     }
 
@@ skipping 20 matching lines @@
     void setBaseValueAsString(const String& value, SVGParsingError& parseError) override
     {
         TrackExceptionState es;
 
         m_baseValue->setValueAsString(value, es);
 
         if (es.hadException())
             parseError = ParsingAttributeFailedError;
     }
 
-    virtual PassRefPtr<SVGPropertyBase> createAnimatedValue() override
+    virtual PassRefPtrWillBeRawPtr<SVGPropertyBase> createAnimatedValue() override
     {
         return m_baseValue->clone();
     }
 
-    virtual void setAnimatedValue(PassRefPtr<SVGPropertyBase> passValue) override
+    virtual void setAnimatedValue(PassRefPtrWillBeRawPtr<SVGPropertyBase> passValue) override
     {
-        RefPtr<SVGPropertyBase> value = passValue;
+        RefPtrWillBeRawPtr<SVGPropertyBase> value = passValue;
         ASSERT(value->type() == Property::classType());
         m_currentValue = static_pointer_cast<Property>(value.release());
     }
 
     virtual void animationEnded() override
     {
         m_currentValue.clear();
 
         SVGAnimatedPropertyBase::animationEnded();
     }
 
+    virtual void trace(Visitor* visitor) override
+    {
+        visitor->trace(m_baseValue);
+        visitor->trace(m_currentValue);
+        SVGAnimatedPropertyBase::trace(visitor);
+    }
+
 protected:
-    SVGAnimatedPropertyCommon(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtr<Property> initialValue)
+    SVGAnimatedPropertyCommon(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
         : SVGAnimatedPropertyBase(Property::classType(), contextElement, attributeName)
         , m_baseValue(initialValue)
     {
     }
 
 private:
-    RefPtr<Property> m_baseValue;
-    RefPtr<Property> m_currentValue;
+    RefPtrWillBeMember<Property> m_baseValue;
+    RefPtrWillBeMember<Property> m_currentValue;
 };
 
 // Implementation of SVGAnimatedProperty which uses primitive types.
 // This is for classes which return primitive type for its "animVal".
 // Examples are SVGAnimatedBoolean, SVGAnimatedNumber, etc.
 template <typename Property, typename TearOffType = typename Property::TearOffType, typename PrimitiveType = typename Property::PrimitiveType>
 class SVGAnimatedProperty : public SVGAnimatedPropertyCommon<Property> {
 public:
     virtual bool needsSynchronizeAttribute() override
     {
@@ skipping 31 matching lines @@
         this->contextElement()->invalidateSVGAttributes();
         this->contextElement()->svgAttributeChanged(this->attributeName());
     }
 
     PrimitiveType animVal()
     {
         return this->currentValue()->value();
     }
 
 protected:
-    SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtr<Property> initialValue)
+    SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
         : SVGAnimatedPropertyCommon<Property>(contextElement, attributeName, initialValue)
         , m_baseValueUpdated(false)
     {
     }
 
     bool m_baseValueUpdated;
 };
 
 // Implementation of SVGAnimatedProperty which uses tear-off value types.
 // These classes has "void" for its PrimitiveType.
 // This is for classes which return special type for its "animVal".
 // Examples are SVGAnimatedLength, SVGAnimatedRect, SVGAnimated*List, etc.
 template <typename Property, typename TearOffType>
 class SVGAnimatedProperty<Property, TearOffType, void> : public SVGAnimatedPropertyCommon<Property> {
 public:
-    static PassRefPtr<SVGAnimatedProperty<Property> > create(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtr<Property> initialValue)
+    static PassRefPtrWillBeRawPtr<SVGAnimatedProperty<Property> > create(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
     {
-        return adoptRef(new SVGAnimatedProperty<Property>(contextElement, attributeName, initialValue));
+        return adoptRefWillBeNoop(new SVGAnimatedProperty<Property>(contextElement, attributeName, initialValue));
     }
 
-    virtual void setAnimatedValue(PassRefPtr<SVGPropertyBase> value) override
+    virtual void setAnimatedValue(PassRefPtrWillBeRawPtr<SVGPropertyBase> value) override
     {
         SVGAnimatedPropertyCommon<Property>::setAnimatedValue(value);
         updateAnimValTearOffIfNeeded();
     }
 
     virtual void animationEnded() override
     {
         SVGAnimatedPropertyCommon<Property>::animationEnded();
         updateAnimValTearOffIfNeeded();
     }
@@ skipping 21 matching lines @@
     }
 
     TearOffType* animVal()
     {
         if (!m_animValTearOff)
             m_animValTearOff = TearOffType::create(this->currentValue(), this->contextElement(), PropertyIsAnimVal, this->attributeName());
 
         return m_animValTearOff.get();
     }
 
+    virtual void trace(Visitor* visitor) override
+    {
+        visitor->trace(m_baseValTearOff);
+        visitor->trace(m_animValTearOff);
+        SVGAnimatedPropertyCommon<Property>::trace(visitor);
+    }
+
 protected:
-    SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtr<Property> initialValue)
+    SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
         : SVGAnimatedPropertyCommon<Property>(contextElement, attributeName, initialValue)
     {
     }
 
 private:
     void updateAnimValTearOffIfNeeded()
     {
         if (m_animValTearOff)
             m_animValTearOff->setTarget(this->currentValue());
     }
 
     // When still (not animated):
     //     Both m_animValTearOff and m_baseValTearOff target m_baseValue.
     // When animated:
     //     m_animValTearOff targets m_currentValue.
     //     m_baseValTearOff targets m_baseValue.
-    RefPtr<TearOffType> m_baseValTearOff;
-    RefPtr<TearOffType> m_animValTearOff;
+    RefPtrWillBeMember<TearOffType> m_baseValTearOff;
+    RefPtrWillBeMember<TearOffType> m_animValTearOff;
 };
 
-}
+} // namespace blink
 
 #endif // SVGAnimatedProperty_h