| OLD | NEW |
| 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_SCOPED_TEXTURE_H_ | 5 #ifndef CC_SCOPED_RESOURCE_H_ |
| 6 #define CC_SCOPED_TEXTURE_H_ | 6 #define CC_SCOPED_RESOURCE_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "cc/cc_export.h" | 11 #include "cc/cc_export.h" |
| 12 #include "cc/texture.h" | 12 #include "cc/resource.h" |
| 13 | 13 |
| 14 #ifndef NDEBUG | 14 #ifndef NDEBUG |
| 15 #include "base/threading/platform_thread.h" | 15 #include "base/threading/platform_thread.h" |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 namespace cc { | 18 namespace cc { |
| 19 | 19 |
| 20 class CC_EXPORT ScopedTexture : protected Texture { | 20 class CC_EXPORT ScopedResource : protected Resource { |
| 21 public: | 21 public: |
| 22 static scoped_ptr<ScopedTexture> create(ResourceProvider* resourceProvider)
{ return make_scoped_ptr(new ScopedTexture(resourceProvider)); } | 22 static scoped_ptr<ScopedResource> create(ResourceProvider* resourceProvider)
{ return make_scoped_ptr(new ScopedResource(resourceProvider)); } |
| 23 virtual ~ScopedTexture(); | 23 virtual ~ScopedResource(); |
| 24 | 24 |
| 25 using Texture::id; | 25 using Resource::id; |
| 26 using Texture::size; | 26 using Resource::size; |
| 27 using Texture::format; | 27 using Resource::format; |
| 28 using Texture::bytes; | 28 using Resource::bytes; |
| 29 | 29 |
| 30 bool allocate(int pool, const gfx::Size&, GLenum format, ResourceProvider::T
extureUsageHint); | 30 bool allocate(int pool, const gfx::Size&, GLenum format, ResourceProvider::T
extureUsageHint); |
| 31 void free(); | 31 void free(); |
| 32 void leak(); | 32 void leak(); |
| 33 | 33 |
| 34 protected: | 34 protected: |
| 35 explicit ScopedTexture(ResourceProvider*); | 35 explicit ScopedResource(ResourceProvider*); |
| 36 | 36 |
| 37 private: | 37 private: |
| 38 ResourceProvider* m_resourceProvider; | 38 ResourceProvider* m_resourceProvider; |
| 39 | 39 |
| 40 #ifndef NDEBUG | 40 #ifndef NDEBUG |
| 41 base::PlatformThreadId m_allocateThreadIdentifier; | 41 base::PlatformThreadId m_allocateThreadIdentifier; |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 DISALLOW_COPY_AND_ASSIGN(ScopedTexture); | 44 DISALLOW_COPY_AND_ASSIGN(ScopedResource); |
| 45 }; | 45 }; |
| 46 | 46 |
| 47 } | 47 } |
| 48 | 48 |
| 49 #endif // CC_SCOPED_TEXTURE_H_ | 49 #endif // CC_SCOPED_RESOURCE_H_ |
| OLD | NEW |