Oilpan: Remove most WillBe types from the code base

third_party/WebKit/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 28 matching lines @@
 #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 RefCountedWillBeGarbageCollectedFinalized<SVGAnimatedPropertyBase>, public ScriptWrappable {
+class SVGAnimatedPropertyBase : public GarbageCollectedFinalized<SVGAnimatedPropertyBase>, public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO_NOT_REACHED();
     WTF_MAKE_NONCOPYABLE(SVGAnimatedPropertyBase);
 public:
     virtual ~SVGAnimatedPropertyBase();
 
     virtual SVGPropertyBase* currentValueBase() = 0;
     virtual const SVGPropertyBase& baseValueBase() const = 0;
     virtual bool isAnimating() const = 0;
 
-    virtual PassRefPtrWillBeRawPtr<SVGPropertyBase> createAnimatedValue() = 0;
-    virtual void setAnimatedValue(PassRefPtrWillBeRawPtr<SVGPropertyBase>) = 0;
+    virtual RawPtr<SVGPropertyBase> createAnimatedValue() = 0;
+    virtual void setAnimatedValue(RawPtr<SVGPropertyBase>) = 0;
     virtual void animationEnded();
 
     virtual SVGParsingError setBaseValueAsString(const String&) = 0;
     virtual bool needsSynchronizeAttribute() = 0;
     virtual void synchronizeAttribute();
 
     AnimatedPropertyType type() const
     {
         return m_type;
     }
@@ skipping 27 matching lines @@
 protected:
     SVGAnimatedPropertyBase(AnimatedPropertyType, SVGElement*, const QualifiedName& attributeName);
 
 private:
     const AnimatedPropertyType m_type;
     bool m_isReadOnly;
 
     // This raw pointer is safe since the SVG element is guaranteed to be kept
     // alive by a V8 wrapper.
     // See http://crbug.com/528275 for the detail.
-    RawPtrWillBeUntracedMember<SVGElement> m_contextElement;
+    UntracedMember<SVGElement> m_contextElement;
 
     const QualifiedName& m_attributeName;
 };
 
 template <typename Property>
 class SVGAnimatedPropertyCommon : public SVGAnimatedPropertyBase {
 public:
     Property* baseValue()
     {
         return m_baseValue.get();
@@ skipping 22 matching lines @@
     bool isAnimating() const override
     {
         return m_currentValue;
     }
 
     SVGParsingError setBaseValueAsString(const String& value) override
     {
         return m_baseValue->setValueAsString(value);
     }
 
-    PassRefPtrWillBeRawPtr<SVGPropertyBase> createAnimatedValue() override
+    RawPtr<SVGPropertyBase> createAnimatedValue() override
     {
         return m_baseValue->clone();
     }
 
-    void setAnimatedValue(PassRefPtrWillBeRawPtr<SVGPropertyBase> passValue) override
+    void setAnimatedValue(RawPtr<SVGPropertyBase> passValue) override
     {
-        RefPtrWillBeRawPtr<SVGPropertyBase> value = passValue;
+        RawPtr<SVGPropertyBase> value = passValue;
         ASSERT(value->type() == Property::classType());
         m_currentValue = static_pointer_cast<Property>(value.release());
     }
 
     void animationEnded() override
     {
         m_currentValue.clear();
 
         SVGAnimatedPropertyBase::animationEnded();
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_baseValue);
         visitor->trace(m_currentValue);
         SVGAnimatedPropertyBase::trace(visitor);
     }
 
 protected:
-    SVGAnimatedPropertyCommon(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+    SVGAnimatedPropertyCommon(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<Property> initialValue)
         : SVGAnimatedPropertyBase(Property::classType(), contextElement, attributeName)
         , m_baseValue(initialValue)
     {
     }
 
 private:
-    RefPtrWillBeMember<Property> m_baseValue;
-    RefPtrWillBeMember<Property> m_currentValue;
+    Member<Property> m_baseValue;
+    Member<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:
     bool needsSynchronizeAttribute() override
     {
@@ skipping 32 matching lines @@
         this->contextElement()->svgAttributeBaseValChanged(this->attributeName());
     }
 
     PrimitiveType animVal()
     {
         this->contextElement()->ensureAttributeAnimValUpdated();
         return this->currentValue()->value();
     }
 
 protected:
-    SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+    SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<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 PassRefPtrWillBeRawPtr<SVGAnimatedProperty<Property>> create(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+    static RawPtr<SVGAnimatedProperty<Property>> create(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<Property> initialValue)
     {
-        return adoptRefWillBeNoop(new SVGAnimatedProperty<Property>(contextElement, attributeName, initialValue));
+        return (new SVGAnimatedProperty<Property>(contextElement, attributeName, initialValue));
     }
 
-    void setAnimatedValue(PassRefPtrWillBeRawPtr<SVGPropertyBase> value) override
+    void setAnimatedValue(RawPtr<SVGPropertyBase> value) override
     {
         SVGAnimatedPropertyCommon<Property>::setAnimatedValue(value);
         updateAnimValTearOffIfNeeded();
     }
 
     void animationEnded() override
     {
         SVGAnimatedPropertyCommon<Property>::animationEnded();
         updateAnimValTearOffIfNeeded();
     }
@@ skipping 29 matching lines @@
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_baseValTearOff);
         visitor->trace(m_animValTearOff);
         SVGAnimatedPropertyCommon<Property>::trace(visitor);
     }
 
 protected:
-    SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+    SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<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.
-    RefPtrWillBeMember<TearOffType> m_baseValTearOff;
-    RefPtrWillBeMember<TearOffType> m_animValTearOff;
+    Member<TearOffType> m_baseValTearOff;
+    Member<TearOffType> m_animValTearOff;
 };
 
 // Implementation of SVGAnimatedProperty which doesn't use tear-off value types.
 // This class has "void" for its TearOffType.
 // Currently only used for SVGAnimatedPath.
 template <typename Property>
 class SVGAnimatedProperty<Property, void, void> : public SVGAnimatedPropertyCommon<Property> {
 public:
-    static PassRefPtrWillBeRawPtr<SVGAnimatedProperty<Property>> create(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+    static RawPtr<SVGAnimatedProperty<Property>> create(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<Property> initialValue)
     {
-        return adoptRefWillBeNoop(new SVGAnimatedProperty<Property>(contextElement, attributeName, initialValue));
+        return (new SVGAnimatedProperty<Property>(contextElement, attributeName, initialValue));
     }
 
     bool needsSynchronizeAttribute() override
     {
         // DOM attribute synchronization is only needed if the property is being animated.
         return this->isAnimating();
     }
 
 protected:
-    SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, PassRefPtrWillBeRawPtr<Property> initialValue)
+    SVGAnimatedProperty(SVGElement* contextElement, const QualifiedName& attributeName, RawPtr<Property> initialValue)
         : SVGAnimatedPropertyCommon<Property>(contextElement, attributeName, initialValue)
     {
     }
 };
 
 } // namespace blink
 
 #endif // SVGAnimatedProperty_h