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

Side by Side Diff: cc/resources/resource_pool.h

Issue 1441613002: cc: Remove ScopedPtrDeque. (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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_RESOURCES_RESOURCE_POOL_H_ 5 #ifndef CC_RESOURCES_RESOURCE_POOL_H_
6 #define CC_RESOURCES_RESOURCE_POOL_H_ 6 #define CC_RESOURCES_RESOURCE_POOL_H_
7 7
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/containers/scoped_ptr_map.h" 10 #include "base/containers/scoped_ptr_map.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/trace_event/memory_dump_provider.h" 12 #include "base/trace_event/memory_dump_provider.h"
13 #include "cc/base/cc_export.h" 13 #include "cc/base/cc_export.h"
14 #include "cc/base/scoped_ptr_deque.h"
15 #include "cc/output/renderer.h" 14 #include "cc/output/renderer.h"
16 #include "cc/resources/resource.h" 15 #include "cc/resources/resource.h"
17 #include "cc/resources/resource_format.h" 16 #include "cc/resources/resource_format.h"
18 #include "cc/resources/scoped_resource.h" 17 #include "cc/resources/scoped_resource.h"
19 18
20 namespace cc { 19 namespace cc {
21 20
22 class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider { 21 class CC_EXPORT ResourcePool : public base::trace_event::MemoryDumpProvider {
23 public: 22 public:
24 static scoped_ptr<ResourcePool> CreateForImageTextureTarget( 23 static scoped_ptr<ResourcePool> CreateForImageTextureTarget(
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 109
111 ResourceProvider* resource_provider_; 110 ResourceProvider* resource_provider_;
112 bool use_image_texture_target_; 111 bool use_image_texture_target_;
113 size_t max_memory_usage_bytes_; 112 size_t max_memory_usage_bytes_;
114 size_t max_resource_count_; 113 size_t max_resource_count_;
115 size_t in_use_memory_usage_bytes_; 114 size_t in_use_memory_usage_bytes_;
116 size_t total_memory_usage_bytes_; 115 size_t total_memory_usage_bytes_;
117 size_t total_resource_count_; 116 size_t total_resource_count_;
118 117
119 // Holds most recently used resources at the front of the queue. 118 // Holds most recently used resources at the front of the queue.
120 using ResourceDeque = ScopedPtrDeque<PoolResource>; 119 using ResourceDeque = std::deque<scoped_ptr<PoolResource>>;
121 ResourceDeque unused_resources_; 120 ResourceDeque unused_resources_;
122 ResourceDeque busy_resources_; 121 ResourceDeque busy_resources_;
123 122
124 using ResourceMap = base::ScopedPtrMap<ResourceId, scoped_ptr<PoolResource>>; 123 using ResourceMap = base::ScopedPtrMap<ResourceId, scoped_ptr<PoolResource>>;
125 ResourceMap in_use_resources_; 124 ResourceMap in_use_resources_;
126 125
127 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 126 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
128 bool evict_expired_resources_pending_; 127 bool evict_expired_resources_pending_;
129 base::TimeDelta resource_expiration_delay_; 128 base::TimeDelta resource_expiration_delay_;
130 129
131 base::WeakPtrFactory<ResourcePool> weak_ptr_factory_; 130 base::WeakPtrFactory<ResourcePool> weak_ptr_factory_;
132 131
133 DISALLOW_COPY_AND_ASSIGN(ResourcePool); 132 DISALLOW_COPY_AND_ASSIGN(ResourcePool);
134 }; 133 };
135 134
136 } // namespace cc 135 } // namespace cc
137 136
138 #endif // CC_RESOURCES_RESOURCE_POOL_H_ 137 #endif // CC_RESOURCES_RESOURCE_POOL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698