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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/animation/layer_animation_controller.h

Issue 1437413002: cc: Remove ScopedPtrVector and cc::remove_if. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: just the vector 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
« cc/animation/keyframed_animation_curve.h ('K') | « cc/animation/keyframed_animation_curve.cc ('k') | cc/animation/layer_animation_controller.cc » ('j') | cc/animation/layer_animation_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/layer_animation_controller.h
diff --git a/cc/animation/layer_animation_controller.h b/cc/animation/layer_animation_controller.h
index 307e89920ae213dad4233b8c02b82442c21f33e9..22a6f5367d093817276ba4382d8915a0818659d3 100644
--- a/cc/animation/layer_animation_controller.h
+++ b/cc/animation/layer_animation_controller.h
@@ -14,7 +14,6 @@
#include "cc/animation/animation_events.h"
#include "cc/animation/layer_animation_event_observer.h"
#include "cc/base/cc_export.h"
-#include "cc/base/scoped_ptr_vector.h"
danakj 2015/11/17 01:12:16 include vector
#include "ui/gfx/geometry/scroll_offset.h"
#include "ui/gfx/transform.h"
@@ -224,7 +223,7 @@ class CC_EXPORT LayerAnimationController
AnimationRegistrar* registrar_;
int id_;
- ScopedPtrVector<Animation> animations_;
+ std::vector<scoped_ptr<Animation>> animations_;
// This is used to ensure that we don't spam the registrar.
bool is_active_;
« cc/animation/keyframed_animation_curve.h ('K') | « cc/animation/keyframed_animation_curve.cc ('k') | cc/animation/layer_animation_controller.cc » ('j') | cc/animation/layer_animation_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698