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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/compositor/layer.h

Issue 1437413002: cc: Remove ScopedPtrVector and cc::remove_if. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + fix 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
« content/common/cc_messages.cc ('K') | « content/renderer/child_frame_compositing_helper.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index 187a3d9fcae1d180106e5572d46c376d59aef558..d6f593a0f418deb6edee2f27374eda91d5d4cf84 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -15,7 +15,6 @@
#include "cc/animation/animation_events.h"
#include "cc/animation/layer_animation_event_observer.h"
#include "cc/base/region.h"
-#include "cc/base/scoped_ptr_vector.h"
#include "cc/layers/content_layer_client.h"
#include "cc/layers/layer_client.h"
#include "cc/layers/surface_layer.h"
@@ -505,7 +504,7 @@ class COMPOSITOR_EXPORT Layer
// Animations that are passed to AddThreadedAnimation before this layer is
// added to a tree.
- cc::ScopedPtrVector<cc::Animation> pending_threaded_animations_;
+ std::vector<scoped_ptr<cc::Animation>> pending_threaded_animations_;
// Ownership of the layer is held through one of the strongly typed layer
// pointers, depending on which sort of layer this is.
« content/common/cc_messages.cc ('K') | « content/renderer/child_frame_compositing_helper.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698