Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Unified Diff: Source/core/animation/StringKeyframe.h

Issue 222893005: Oilpan: Fix oilpan builds after r170720 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/animation/StringKeyframe.h
diff --git a/Source/core/animation/StringKeyframe.h b/Source/core/animation/StringKeyframe.h
index c2cd1283e24118068955860580081df47d4555c4..fb8a452b00ade9774190302cc8fc3a35a545bae3 100644
--- a/Source/core/animation/StringKeyframe.h
+++ b/Source/core/animation/StringKeyframe.h
@@ -12,7 +12,10 @@ namespace WebCore {
class StringKeyframe : public Keyframe {
public:
- static PassRefPtr<StringKeyframe> create() { return adoptRef(new StringKeyframe); }
+ static PassRefPtrWillBeRawPtr<StringKeyframe> create()
+ {
+ return adoptRefWillBeNoop(new StringKeyframe);
+ }
void setPropertyValue(CSSPropertyID property, const String& value)
{
m_propertyValues.add(property, value);
@@ -25,18 +28,23 @@ public:
}
virtual PropertySet properties() const OVERRIDE;
+ virtual void trace(Visitor*) OVERRIDE;
+
class PropertySpecificKeyframe : public Keyframe::PropertySpecificKeyframe {
public:
PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const String& value, AnimationEffect::CompositeOperation);
const String& value() const { return m_value; }
- virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINAL;
- virtual PassRefPtr<Interpolation> createInterpolation(CSSPropertyID, WebCore::Keyframe::PropertySpecificKeyframe* end) const OVERRIDE FINAL;
+ virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const OVERRIDE FINAL;
+ virtual PassRefPtrWillBeRawPtr<Interpolation> createInterpolation(CSSPropertyID, WebCore::Keyframe::PropertySpecificKeyframe* end) const OVERRIDE FINAL;
+
+ virtual void trace(Visitor*) OVERRIDE;
+
private:
PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, const String& value);
- virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const;
+ virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> cloneWithOffset(double offset) const;
virtual bool isStringPropertySpecificKeyframe() const OVERRIDE { return true; }
String m_value;
@@ -48,7 +56,7 @@ private:
StringKeyframe(const StringKeyframe& copyFrom);
virtual PassRefPtrWillBeRawPtr<Keyframe> clone() const OVERRIDE;
- virtual PassOwnPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const OVERRIDE;
+ virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> createPropertySpecificKeyframe(CSSPropertyID) const OVERRIDE;
virtual bool isStringKeyframe() const OVERRIDE { return true; }

Powered by Google App Engine
This is Rietveld 408576698