Chromium Code Reviews| Index: cc/scoped_resource.h |
| diff --git a/cc/scoped_resource.h b/cc/scoped_resource.h |
| index 1ad5cc755503edb2edeeb1a43f4507bf9a5ac930..94e8891db405e987b132ebcf4151c9e972eeff26 100644 |
| --- a/cc/scoped_resource.h |
| +++ b/cc/scoped_resource.h |
| @@ -17,31 +17,28 @@ |
| namespace cc { |
| -class CC_EXPORT ScopedResource : protected Resource { |
| -public: |
| - static scoped_ptr<ScopedResource> create(ResourceProvider* resourceProvider) { return make_scoped_ptr(new ScopedResource(resourceProvider)); } |
| - virtual ~ScopedResource(); |
| +class CC_EXPORT ScopedResource : public Resource { |
| + public: |
| + static scoped_ptr<ScopedResource> create(ResourceProvider* resource_provider) { |
|
tfarina
2012/11/15 23:46:11
static void Foo(Bar* bar) {
^If it
|
| + return make_scoped_ptr(new ScopedResource(resource_provider)); |
| + } |
| + virtual ~ScopedResource(); |
| - using Resource::id; |
| - using Resource::size; |
| - using Resource::format; |
| - using Resource::bytes; |
| + bool Allocate(int pool, const gfx::Size&, GLenum format, ResourceProvider::TextureUsageHint); |
|
tfarina
2012/11/15 23:46:11
do want to fix this while you are here?
Write one
|
| + void Free(); |
| + void Leak(); |
| - bool allocate(int pool, const gfx::Size&, GLenum format, ResourceProvider::TextureUsageHint); |
| - void free(); |
| - void leak(); |
| + protected: |
| + explicit ScopedResource(ResourceProvider*); |
| -protected: |
| - explicit ScopedResource(ResourceProvider*); |
| - |
| -private: |
| - ResourceProvider* m_resourceProvider; |
| + private: |
| + ResourceProvider* resource_provider_; |
| #ifndef NDEBUG |
| - base::PlatformThreadId m_allocateThreadIdentifier; |
| + base::PlatformThreadId allocate_thread_id_; |
| #endif |
| - DISALLOW_COPY_AND_ASSIGN(ScopedResource); |
| + DISALLOW_COPY_AND_ASSIGN(ScopedResource); |
| }; |
| } |