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

Unified Diff: cc/resources/resource_pool.h

Issue 1462763002: Remove ScopedPtrMap from /cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Matt's review 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 | « no previous file | cc/resources/resource_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_pool.h
diff --git a/cc/resources/resource_pool.h b/cc/resources/resource_pool.h
index e5a2166968b9bb24c4b7ae07baad757136be629a..e17032b4f81c9b4fafd29740b2ee3ce335e80427 100644
--- a/cc/resources/resource_pool.h
+++ b/cc/resources/resource_pool.h
@@ -6,8 +6,8 @@
#define CC_RESOURCES_RESOURCE_POOL_H_
#include <deque>
+#include <map>
-#include "base/containers/scoped_ptr_map.h"
#include "base/memory/scoped_ptr.h"
#include "base/trace_event/memory_dump_provider.h"
#include "cc/base/cc_export.h"
@@ -120,8 +120,7 @@ class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider {
ResourceDeque unused_resources_;
ResourceDeque busy_resources_;
- using ResourceMap = base::ScopedPtrMap<ResourceId, scoped_ptr<PoolResource>>;
- ResourceMap in_use_resources_;
+ std::map<ResourceId, scoped_ptr<PoolResource>> in_use_resources_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
bool evict_expired_resources_pending_;
« no previous file with comments | « no previous file | cc/resources/resource_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698