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

Unified Diff: cc/animation/animation_player.h

Issue 1437413002: cc: Remove ScopedPtrVector and cc::remove_if. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « cc/PRESUBMIT.py ('k') | cc/animation/animation_player.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/animation_player.h
diff --git a/cc/animation/animation_player.h b/cc/animation/animation_player.h
index afb819d5c5e1816b664f56740d4475a49958b300..3665a2381b54ae8da03cc0d26cc269413f6ad3a1 100644
--- a/cc/animation/animation_player.h
+++ b/cc/animation/animation_player.h
@@ -5,12 +5,13 @@
#ifndef CC_ANIMATION_ANIMATION_PLAYER_H_
#define CC_ANIMATION_ANIMATION_PLAYER_H_
+#include <vector>
+
#include "base/containers/linked_list.h"
#include "base/memory/ref_counted.h"
#include "base/time/time.h"
#include "cc/animation/animation.h"
#include "cc/base/cc_export.h"
-#include "cc/base/scoped_ptr_vector.h"
namespace cc {
@@ -94,8 +95,7 @@ class CC_EXPORT AnimationPlayer : public base::RefCounted<AnimationPlayer>,
// We accumulate added animations in animations_ container
// if element_animations_ is a nullptr. It allows us to add/remove animations
// to non-attached AnimationPlayers.
- typedef ScopedPtrVector<Animation> AnimationList;
- AnimationList animations_;
+ std::vector<scoped_ptr<Animation>> animations_;
AnimationHost* animation_host_;
AnimationTimeline* animation_timeline_;
« no previous file with comments | « cc/PRESUBMIT.py ('k') | cc/animation/animation_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698