| Index: third_party/WebKit/Source/core/svg/properties/SVGProperty.h
|
| diff --git a/third_party/WebKit/Source/core/svg/properties/SVGProperty.h b/third_party/WebKit/Source/core/svg/properties/SVGProperty.h
|
| index f29a6f8f85568a27f0fbd6467f81f7be5a319ce2..c081c4ec0646a7ee896dad20eab173b40f146634 100644
|
| --- a/third_party/WebKit/Source/core/svg/properties/SVGProperty.h
|
| +++ b/third_party/WebKit/Source/core/svg/properties/SVGProperty.h
|
| @@ -43,7 +43,7 @@ namespace blink {
|
| class SVGElement;
|
| class SVGAnimationElement;
|
|
|
| -class SVGPropertyBase : public RefCountedWillBeGarbageCollectedFinalized<SVGPropertyBase> {
|
| +class SVGPropertyBase : public GarbageCollectedFinalized<SVGPropertyBase> {
|
| WTF_MAKE_NONCOPYABLE(SVGPropertyBase);
|
|
|
| public:
|
| @@ -61,14 +61,14 @@ public:
|
|
|
| // FIXME: remove this in WebAnimations transition.
|
| // This is used from SVGAnimatedNewPropertyAnimator for its animate-by-string implementation.
|
| - virtual PassRefPtrWillBeRawPtr<SVGPropertyBase> cloneForAnimation(const String&) const = 0;
|
| + virtual RawPtr<SVGPropertyBase> cloneForAnimation(const String&) const = 0;
|
|
|
| virtual String valueAsString() const = 0;
|
|
|
| // FIXME: remove below and just have this inherit AnimatableValue in WebAnimations transition.
|
| - virtual void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) = 0;
|
| - virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement*) = 0;
|
| - virtual float calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGElement*) = 0;
|
| + virtual void add(RawPtr<SVGPropertyBase>, SVGElement*) = 0;
|
| + virtual void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, RawPtr<SVGPropertyBase> from, RawPtr<SVGPropertyBase> to, RawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement*) = 0;
|
| + virtual float calculateDistance(RawPtr<SVGPropertyBase> to, SVGElement*) = 0;
|
|
|
| AnimatedPropertyType type() const
|
| {
|
| @@ -104,14 +104,14 @@ private:
|
| // cycles when SVG properties meet the off-heap InterpolationValue hierarchy.
|
| // Not tracing it is safe, albeit an undesirable state of affairs.
|
| // See http://crbug.com/528275 for the detail.
|
| - RawPtrWillBeUntracedMember<SVGPropertyBase> m_ownerList;
|
| + UntracedMember<SVGPropertyBase> m_ownerList;
|
| };
|
|
|
| #define DEFINE_SVG_PROPERTY_TYPE_CASTS(thisType)\
|
| DEFINE_TYPE_CASTS(thisType, SVGPropertyBase, value, value->type() == thisType::classType(), value.type() == thisType::classType());\
|
| - inline PassRefPtrWillBeRawPtr<thisType> to##thisType(PassRefPtrWillBeRawPtr<SVGPropertyBase> passBase)\
|
| + inline RawPtr<thisType> to##thisType(RawPtr<SVGPropertyBase> passBase)\
|
| {\
|
| - RefPtrWillBeRawPtr<SVGPropertyBase> base = passBase;\
|
| + RawPtr<SVGPropertyBase> base = passBase;\
|
| ASSERT(base->type() == thisType::classType());\
|
| return static_pointer_cast<thisType>(base.release());\
|
| }
|
|
|