Index: Source/core/animation/animatable/AnimatableSVGPaint.h |
diff --git a/Source/core/animation/animatable/AnimatableSVGPaint.h b/Source/core/animation/animatable/AnimatableSVGPaint.h |
index f35bf3bc455bccf6cf4ec71e217de3ed3b6694a9..ff24682f4478f43dfe54af961ad39aac88cfeef3 100644 |
--- a/Source/core/animation/animatable/AnimatableSVGPaint.h |
+++ b/Source/core/animation/animatable/AnimatableSVGPaint.h |
@@ -40,19 +40,19 @@ namespace blink { |
class AnimatableSVGPaint final : public AnimatableValue { |
public: |
virtual ~AnimatableSVGPaint() { } |
- static PassRefPtrWillBeRawPtr<AnimatableSVGPaint> create( |
+ static AnimatableSVGPaint* create( |
SVGPaintType type, SVGPaintType visitedLinkType, |
const Color& color, const Color& visitedLinkColor, |
const String& uri, const String& visitedLinkURI) |
{ |
return create(type, visitedLinkType, AnimatableColor::create(color, visitedLinkColor), uri, visitedLinkURI); |
} |
- static PassRefPtrWillBeRawPtr<AnimatableSVGPaint> create( |
+ static AnimatableSVGPaint* create( |
SVGPaintType type, SVGPaintType visitedLinkType, |
- PassRefPtrWillBeRawPtr<AnimatableColor> color, |
+ AnimatableColor* color, |
const String& uri, const String& visitedLinkURI) |
{ |
- return adoptRefWillBeNoop(new AnimatableSVGPaint(type, visitedLinkType, color, uri, visitedLinkURI)); |
+ return new AnimatableSVGPaint(type, visitedLinkType, color, uri, visitedLinkURI); |
} |
SVGPaintType paintType() const { return m_type; }; |
SVGPaintType visitedLinkPaintType() const { return m_visitedLinkType; }; |
@@ -68,11 +68,11 @@ public: |
} |
protected: |
- virtual PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const override; |
+ virtual AnimatableValue* interpolateTo(const AnimatableValue*, double fraction) const override; |
virtual bool usesDefaultInterpolationWith(const AnimatableValue*) const override; |
private: |
- AnimatableSVGPaint(SVGPaintType type, SVGPaintType visitedLinkType, PassRefPtrWillBeRawPtr<AnimatableColor> color, const String& uri, const String& visitedLinkURI) |
+ AnimatableSVGPaint(SVGPaintType type, SVGPaintType visitedLinkType, AnimatableColor* color, const String& uri, const String& visitedLinkURI) |
: m_type(type) |
, m_visitedLinkType(visitedLinkType) |
, m_color(color) |
@@ -86,7 +86,7 @@ private: |
SVGPaintType m_type; |
SVGPaintType m_visitedLinkType; |
// AnimatableColor includes a visited link color. |
- RefPtrWillBeMember<AnimatableColor> m_color; |
+ Member<AnimatableColor> m_color; |
String m_uri; |
String m_visitedLinkURI; |
}; |