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

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

Issue 1318543009: Oilpan: Partially ship Oilpan for core/animations (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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
« no previous file with comments | « Source/core/animation/EffectModel.idl ('k') | Source/core/animation/ElementAnimations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/ElementAnimation.h
diff --git a/Source/core/animation/ElementAnimation.h b/Source/core/animation/ElementAnimation.h
index 791c2805da9acb29e90c72f333b211da0d44fe9f..56b514b50e876625ef740cc45919292111fc6100 100644
--- a/Source/core/animation/ElementAnimation.h
+++ b/Source/core/animation/ElementAnimation.h
@@ -52,7 +52,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));
@@ -60,7 +60,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));
@@ -68,15 +68,15 @@ 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());
}
- static WillBeHeapVector<RefPtrWillBeMember<Animation>> getAnimations(Element& element)
+ static HeapVector<Member<Animation>> getAnimations(Element& element)
{
- WillBeHeapVector<RefPtrWillBeMember<Animation>> animationss;
+ HeapVector<Member<Animation>> animationss;
if (!element.hasAnimations())
return animationss;
@@ -90,10 +90,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);
}
};
« no previous file with comments | « Source/core/animation/EffectModel.idl ('k') | Source/core/animation/ElementAnimations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698