cc: Remove ScopedPtrVector and cc::remove_if.

cc/animation/keyframed_animation_curve.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_
 #define CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_
 
 #include "base/time/time.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/timing_function.h"
 #include "cc/animation/transform_operations.h"
 #include "cc/base/cc_export.h"
-#include "cc/base/scoped_ptr_vector.h"

[danakj, 2015/11/17 01:12:16]

include vector tho, iwyu

[vmpstr, 2015/11/17 23:26:23]

Done.

 
 namespace cc {
 
 class CC_EXPORT Keyframe {
  public:
   base::TimeDelta Time() const;
   const TimingFunction* timing_function() const {
     return timing_function_.get();
   }
 
@@ skipping 105 matching lines @@
   scoped_ptr<AnimationCurve> Clone() const override;
 
   // BackgrounColorAnimationCurve implementation
   SkColor GetValue(base::TimeDelta t) const override;
 
  private:
   KeyframedColorAnimationCurve();
 
   // Always sorted in order of increasing time. No two keyframes have the
   // same time.
-  ScopedPtrVector<ColorKeyframe> keyframes_;
+  std::vector<scoped_ptr<ColorKeyframe>> keyframes_;
   scoped_ptr<TimingFunction> timing_function_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyframedColorAnimationCurve);
 };
 
 class CC_EXPORT KeyframedFloatAnimationCurve : public FloatAnimationCurve {
  public:
   // It is required that the keyframes be sorted by time.
   static scoped_ptr<KeyframedFloatAnimationCurve> Create();
 
   ~KeyframedFloatAnimationCurve() override;
 
   void AddKeyframe(scoped_ptr<FloatKeyframe> keyframe);
   void SetTimingFunction(scoped_ptr<TimingFunction> timing_function) {
     timing_function_ = timing_function.Pass();
   }
 
   // AnimationCurve implementation
   base::TimeDelta Duration() const override;
   scoped_ptr<AnimationCurve> Clone() const override;
 
   // FloatAnimationCurve implementation
   float GetValue(base::TimeDelta t) const override;
 
  private:
   KeyframedFloatAnimationCurve();
 
   // Always sorted in order of increasing time. No two keyframes have the
   // same time.
-  ScopedPtrVector<FloatKeyframe> keyframes_;
+  std::vector<scoped_ptr<FloatKeyframe>> keyframes_;
   scoped_ptr<TimingFunction> timing_function_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyframedFloatAnimationCurve);
 };
 
 class CC_EXPORT KeyframedTransformAnimationCurve
     : public TransformAnimationCurve {
  public:
   // It is required that the keyframes be sorted by time.
   static scoped_ptr<KeyframedTransformAnimationCurve> Create();
@@ skipping 19 matching lines @@
   bool AnimationStartScale(bool forward_direction,
                            float* start_scale) const override;
   bool MaximumTargetScale(bool forward_direction,
                           float* max_scale) const override;
 
  private:
   KeyframedTransformAnimationCurve();
 
   // Always sorted in order of increasing time. No two keyframes have the
   // same time.
-  ScopedPtrVector<TransformKeyframe> keyframes_;
+  std::vector<scoped_ptr<TransformKeyframe>> keyframes_;
   scoped_ptr<TimingFunction> timing_function_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyframedTransformAnimationCurve);
 };
 
 class CC_EXPORT KeyframedFilterAnimationCurve
     : public FilterAnimationCurve {
  public:
   // It is required that the keyframes be sorted by time.
   static scoped_ptr<KeyframedFilterAnimationCurve> Create();
@@ skipping 11 matching lines @@
 
   // FilterAnimationCurve implementation
   FilterOperations GetValue(base::TimeDelta t) const override;
   bool HasFilterThatMovesPixels() const override;
 
  private:
   KeyframedFilterAnimationCurve();
 
   // Always sorted in order of increasing time. No two keyframes have the
   // same time.
-  ScopedPtrVector<FilterKeyframe> keyframes_;
+  std::vector<scoped_ptr<FilterKeyframe>> keyframes_;
   scoped_ptr<TimingFunction> timing_function_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyframedFilterAnimationCurve);
 };
 
 }  // namespace cc
 
 #endif  // CC_ANIMATION_KEYFRAMED_ANIMATION_CURVE_H_