Oilpan: Fix oilpan builds after r170720

Source/core/animation/KeyframeEffectModel.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 35 matching lines @@
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 class KeyframeEffectModelTest;
 
 class KeyframeEffectModelBase : public AnimationEffect {
 public:
     // FIXME: Implement accumulation.
 
-    typedef Vector<OwnPtr<Keyframe::PropertySpecificKeyframe> > PropertySpecificKeyframeVector;
-    class PropertySpecificKeyframeGroup {
+    typedef WillBeHeapVector<OwnPtrWillBeMember<Keyframe::PropertySpecificKeyframe> > PropertySpecificKeyframeVector;
+    class PropertySpecificKeyframeGroup : public NoBaseWillBeGarbageCollected<PropertySpecificKeyframeGroup> {

[zerny-chromium, 2014/04/03 05:17:11]

nit: FINAL

(Seems reasonable to add when we add a non-virtual trace)

[haraken, 2014/04/03 06:11:00]

Done.

     public:
         void appendKeyframe(PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe>);
         const PropertySpecificKeyframeVector& keyframes() const { return m_keyframes; }
 
         void trace(Visitor*);
 
     private:
         void removeRedundantKeyframes();
         void addSyntheticKeyframeIfRequired(const KeyframeEffectModelBase* context);
 
@@ skipping 32 matching lines @@
     // Lazily computes the groups of property-specific keyframes.
     void ensureKeyframeGroups() const;
     void ensureInterpolationEffect() const;
 
     KeyframeVector m_keyframes;
     // The spec describes filtering the normalized keyframes at sampling time
     // to get the 'property-specific keyframes'. For efficiency, we cache the
     // property-specific lists.
     typedef WillBeHeapHashMap<CSSPropertyID, OwnPtrWillBeMember<PropertySpecificKeyframeGroup> > KeyframeGroupMap;
     mutable OwnPtrWillBeMember<KeyframeGroupMap> m_keyframeGroups;
-    mutable RefPtr<InterpolationEffect> m_interpolationEffect;
+    mutable RefPtrWillBeMember<InterpolationEffect> m_interpolationEffect;
 
     friend class KeyframeEffectModelTest;
 
     bool affects(CSSPropertyID property)
     {
         ensureKeyframeGroups();
         return m_keyframeGroups->contains(property);
     }
 };
 
@@ skipping 34 matching lines @@
 }
 
 inline AnimatableValueKeyframeEffectModel* toAnimatableValueKeyframeEffectModel(AnimationEffect* base)
 {
     return toAnimatableValueKeyframeEffectModel(toKeyframeEffectModelBase(base));
 }
 
 } // namespace WebCore
 
 #endif // KeyframeEffectModel_h