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

Side by Side Diff: cc/resource_pool.h

Issue 11578019: Remove the pools from the ResourceProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-resolve against HEAD Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « cc/renderer.h ('k') | cc/resource_pool.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_RESOURCE_POOL_H_ 5 #ifndef CC_RESOURCE_POOL_H_
6 #define CC_RESOURCE_POOL_H_ 6 #define CC_RESOURCE_POOL_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "cc/renderer.h" 11 #include "cc/renderer.h"
12 #include "cc/resource.h" 12 #include "cc/resource.h"
13 13
14 namespace cc { 14 namespace cc {
15 class ResourceProvider; 15 class ResourceProvider;
16 16
17 class ResourcePool { 17 class ResourcePool {
18 public: 18 public:
19 class Resource : public cc::Resource { 19 class Resource : public cc::Resource {
20 public: 20 public:
21 Resource(ResourceProvider* resource_provider, 21 Resource(ResourceProvider* resource_provider,
22 Renderer::ResourcePool pool_id,
23 const gfx::Size& size, 22 const gfx::Size& size,
24 GLenum format); 23 GLenum format);
25 ~Resource(); 24 ~Resource();
26 25
27 private: 26 private:
28 ResourceProvider* resource_provider_; 27 ResourceProvider* resource_provider_;
29 28
30 DISALLOW_COPY_AND_ASSIGN(Resource); 29 DISALLOW_COPY_AND_ASSIGN(Resource);
31 }; 30 };
32 31
33 static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider, 32 static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider) {
34 Renderer::ResourcePool pool_id) { 33 return make_scoped_ptr(new ResourcePool(resource_provider));
35 return make_scoped_ptr(new ResourcePool(resource_provider, pool_id));
36 } 34 }
37 35
38 virtual ~ResourcePool(); 36 virtual ~ResourcePool();
39 37
40 ResourceProvider* resource_provider() { return resource_provider_; }; 38 ResourceProvider* resource_provider() { return resource_provider_; };
41 39
42 scoped_ptr<ResourcePool::Resource> AcquireResource( 40 scoped_ptr<ResourcePool::Resource> AcquireResource(
43 const gfx::Size&, GLenum format); 41 const gfx::Size&, GLenum format);
44 void ReleaseResource(scoped_ptr<ResourcePool::Resource>); 42 void ReleaseResource(scoped_ptr<ResourcePool::Resource>);
45 43
46 void SetMaxMemoryUsageBytes(size_t max_memory_usage_bytes); 44 void SetMaxMemoryUsageBytes(size_t max_memory_usage_bytes);
47 45
48 protected: 46 protected:
49 ResourcePool(ResourceProvider* resource_provider, 47 ResourcePool(ResourceProvider* resource_provider);
50 Renderer::ResourcePool pool_id);
51 48
52 private: 49 private:
53 ResourceProvider* resource_provider_; 50 ResourceProvider* resource_provider_;
54 Renderer::ResourcePool pool_id_;
55 size_t max_memory_usage_bytes_; 51 size_t max_memory_usage_bytes_;
56 size_t memory_usage_bytes_; 52 size_t memory_usage_bytes_;
57 53
58 typedef std::list<Resource*> ResourceList; 54 typedef std::list<Resource*> ResourceList;
59 ResourceList resources_; 55 ResourceList resources_;
60 56
61 DISALLOW_COPY_AND_ASSIGN(ResourcePool); 57 DISALLOW_COPY_AND_ASSIGN(ResourcePool);
62 }; 58 };
63 59
64 } // namespace cc 60 } // namespace cc
65 61
66 #endif // CC_RESOURCE_POOL_H_ 62 #endif // CC_RESOURCE_POOL_H_
OLDNEW
« no previous file with comments | « cc/renderer.h ('k') | cc/resource_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698