| Index: third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
|
| diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h b/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
|
| index c7aef147acaa5ccd42554dd02b0926dc2e6ac56f..d12b5fcc1b7c4b76f17dc13ca2be2470b7bd302b 100644
|
| --- a/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
|
| +++ b/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
|
| @@ -31,7 +31,7 @@ public:
|
| class NewAnimation {
|
| DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| public:
|
| - NewAnimation(AtomicString name, size_t nameIndex, const InertEffect& effect, Timing timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| + NewAnimation(AtomicString name, size_t nameIndex, const InertEffect& effect, Timing timing, RawPtr<StyleRuleKeyframes> styleRule)
|
| : name(name)
|
| , nameIndex(nameIndex)
|
| , effect(effect)
|
| @@ -51,14 +51,14 @@ public:
|
| size_t nameIndex;
|
| Member<const InertEffect> effect;
|
| Timing timing;
|
| - RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
|
| + Member<StyleRuleKeyframes> styleRule;
|
| unsigned styleRuleVersion;
|
| };
|
|
|
| class UpdatedAnimation {
|
| DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| public:
|
| - UpdatedAnimation(size_t index, Animation* animation, const InertEffect& effect, Timing specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| + UpdatedAnimation(size_t index, Animation* animation, const InertEffect& effect, Timing specifiedTiming, RawPtr<StyleRuleKeyframes> styleRule)
|
| : index(index)
|
| , animation(animation)
|
| , effect(&effect)
|
| @@ -79,7 +79,7 @@ public:
|
| Member<Animation> animation;
|
| Member<const InertEffect> effect;
|
| Timing specifiedTiming;
|
| - RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
|
| + Member<StyleRuleKeyframes> styleRule;
|
| unsigned styleRuleVersion;
|
| };
|
|
|
| @@ -120,7 +120,7 @@ public:
|
| m_updatedCompositorKeyframes.clear();
|
| }
|
|
|
| - void startAnimation(const AtomicString& animationName, size_t nameIndex, const InertEffect& effect, const Timing& timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| + void startAnimation(const AtomicString& animationName, size_t nameIndex, const InertEffect& effect, const Timing& timing, RawPtr<StyleRuleKeyframes> styleRule)
|
| {
|
| m_newAnimations.append(NewAnimation(animationName, nameIndex, effect, timing, styleRule));
|
| }
|
| @@ -136,7 +136,7 @@ public:
|
| m_animationIndicesWithPauseToggled.append(index);
|
| }
|
| void updateAnimation(size_t index, Animation* animation, const InertEffect& effect, const Timing& specifiedTiming,
|
| - PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
|
| + RawPtr<StyleRuleKeyframes> styleRule)
|
| {
|
| m_animationsWithUpdates.append(UpdatedAnimation(index, animation, effect, specifiedTiming, styleRule));
|
| m_suppressedAnimations.add(animation);
|
|
|