Index: Source/core/animation/animatable/AnimatableSVGPaint.h |
diff --git a/Source/core/animation/animatable/AnimatableSVGPaint.h b/Source/core/animation/animatable/AnimatableSVGPaint.h |
index 7e460a31efaacf122ac30326197ec2fd25b64d62..2ebcbe6df9d9345d5326238ecd9403f259f87de4 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: |
~AnimatableSVGPaint() override { } |
- static PassRefPtrWillBeRawPtr<AnimatableSVGPaint> create( |
+ static PassRefPtr<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 PassRefPtr<AnimatableSVGPaint> create( |
SVGPaintType type, SVGPaintType visitedLinkType, |
- PassRefPtrWillBeRawPtr<AnimatableColor> color, |
+ PassRefPtr<AnimatableColor> color, |
const String& uri, const String& visitedLinkURI) |
{ |
- return adoptRefWillBeNoop(new AnimatableSVGPaint(type, visitedLinkType, color, uri, visitedLinkURI)); |
+ return adoptRef(new AnimatableSVGPaint(type, visitedLinkType, color, uri, visitedLinkURI)); |
} |
SVGPaintType paintType() const { return m_type; } |
SVGPaintType visitedLinkPaintType() const { return m_visitedLinkType; } |
@@ -61,18 +61,12 @@ public: |
const String& uri() const { return m_uri; } |
const String& visitedLinkURI() const { return m_visitedLinkURI; } |
- DEFINE_INLINE_VIRTUAL_TRACE() |
- { |
- visitor->trace(m_color); |
- AnimatableValue::trace(visitor); |
- } |
- |
protected: |
- PassRefPtrWillBeRawPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const override; |
+ PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fraction) const override; |
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, PassRefPtr<AnimatableColor> color, const String& uri, const String& visitedLinkURI) |
: m_type(type) |
, m_visitedLinkType(visitedLinkType) |
, m_color(color) |
@@ -86,7 +80,7 @@ private: |
SVGPaintType m_type; |
SVGPaintType m_visitedLinkType; |
// AnimatableColor includes a visited link color. |
- RefPtrWillBeMember<AnimatableColor> m_color; |
+ RefPtr<AnimatableColor> m_color; |
String m_uri; |
String m_visitedLinkURI; |
}; |