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

Unified Diff: Source/core/animation/KeyframeEffectModel.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/KeyframeEffect.cpp ('k') | Source/core/animation/KeyframeEffectModelTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/KeyframeEffectModel.h
diff --git a/Source/core/animation/KeyframeEffectModel.h b/Source/core/animation/KeyframeEffectModel.h
index 8dc00c303c9a98f0957f8d13d0e99319281a6def..319f87277fb58b6beba8e8897cdb3eae47ba4785 100644
--- a/Source/core/animation/KeyframeEffectModel.h
+++ b/Source/core/animation/KeyframeEffectModel.h
@@ -44,7 +44,6 @@
#include "wtf/HashSet.h"
#include "wtf/PassOwnPtr.h"
#include "wtf/PassRefPtr.h"
-#include "wtf/RefCounted.h"
#include "wtf/Vector.h"
namespace blink {
@@ -140,7 +139,7 @@ protected:
// property-specific lists.
using KeyframeGroupMap = WillBeHeapHashMap<PropertyHandle, OwnPtrWillBeMember<PropertySpecificKeyframeGroup>>;
mutable OwnPtrWillBeMember<KeyframeGroupMap> m_keyframeGroups;
- mutable RefPtrWillBeMember<InterpolationEffect> m_interpolationEffect;
+ mutable Member<InterpolationEffect> m_interpolationEffect;
RefPtr<TimingFunction> m_neutralKeyframeEasing;
mutable bool m_hasSyntheticKeyframes;
@@ -152,9 +151,9 @@ template <class Keyframe>
class KeyframeEffectModel final : public KeyframeEffectModelBase {
public:
using KeyframeVector = WillBeHeapVector<RefPtrWillBeMember<Keyframe>>;
- static PassRefPtrWillBeRawPtr<KeyframeEffectModel<Keyframe>> create(const KeyframeVector& keyframes, PassRefPtrWillBeRawPtr<TimingFunction> neutralKeyframeEasing = nullptr)
+ static KeyframeEffectModel<Keyframe>* create(const KeyframeVector& keyframes, PassRefPtrWillBeRawPtr<TimingFunction> neutralKeyframeEasing = nullptr)
{
- return adoptRefWillBeNoop(new KeyframeEffectModel(keyframes, neutralKeyframeEasing));
+ return new KeyframeEffectModel(keyframes, neutralKeyframeEasing);
}
private:
« no previous file with comments | « Source/core/animation/KeyframeEffect.cpp ('k') | Source/core/animation/KeyframeEffectModelTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698