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

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

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Intentional nullptr access Created 5 years, 7 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/ElementAnimation.h
diff --git a/Source/core/animation/ElementAnimation.h b/Source/core/animation/ElementAnimation.h
index ee9884e74ad7a283328b779e3be7c7a071d5760e..bfebae54372e76cb4bff2a700e708802da16fa5d 100644
--- a/Source/core/animation/ElementAnimation.h
+++ b/Source/core/animation/ElementAnimation.h
@@ -50,7 +50,7 @@ class ElementAnimation {
public:
static Animation* animate(Element& element, const EffectModelOrDictionarySequence& effectInput, double duration, ExceptionState& exceptionState)
{
- RefPtrWillBeRawPtr<EffectModel> effect = EffectInput::convert(&element, effectInput, exceptionState);
+ EffectModel* effect = EffectInput::convert(&element, effectInput, exceptionState);
if (exceptionState.hadException())
return 0;
return animateInternal(element, effect, TimingInput::convert(duration));
@@ -58,7 +58,7 @@ public:
static Animation* animate(Element& element, const EffectModelOrDictionarySequence& effectInput, const KeyframeEffectOptions& timingInput, ExceptionState& exceptionState)
{
- RefPtrWillBeRawPtr<EffectModel> effect = EffectInput::convert(&element, effectInput, exceptionState);
+ EffectModel* effect = EffectInput::convert(&element, effectInput, exceptionState);
if (exceptionState.hadException())
return 0;
return animateInternal(element, effect, TimingInput::convert(timingInput));
@@ -66,7 +66,7 @@ public:
static Animation* animate(Element& element, const EffectModelOrDictionarySequence& effectInput, ExceptionState& exceptionState)
{
- RefPtrWillBeRawPtr<EffectModel> effect = EffectInput::convert(&element, effectInput, exceptionState);
+ EffectModel* effect = EffectInput::convert(&element, effectInput, exceptionState);
if (exceptionState.hadException())
return 0;
return animateInternal(element, effect, Timing());
@@ -88,10 +88,10 @@ public:
}
private:
- static Animation* animateInternal(Element& element, PassRefPtrWillBeRawPtr<EffectModel> effect, const Timing& timing)
+ static Animation* animateInternal(Element& element, EffectModel* effect, const Timing& timing)
{
- RefPtrWillBeRawPtr<KeyframeEffect> keyframeEffect = KeyframeEffect::create(&element, effect, timing);
- return element.document().timeline().play(keyframeEffect.get());
+ KeyframeEffect* keyframeEffect = KeyframeEffect::create(&element, effect, timing);
+ return element.document().timeline().play(keyframeEffect);
}
};

Powered by Google App Engine
This is Rietveld 408576698