| Index: cc/scoped_texture.h
|
| diff --git a/cc/scoped_texture.h b/cc/scoped_texture.h
|
| index 7e27fd59c5b3a5130d1dc930efabae990c7df423..641fb403a9b1658c64eddad54dbe36afa30b7d21 100644
|
| --- a/cc/scoped_texture.h
|
| +++ b/cc/scoped_texture.h
|
| @@ -15,31 +15,31 @@
|
|
|
| namespace cc {
|
|
|
| -class CCScopedTexture : protected CCTexture {
|
| +class ScopedTexture : protected Texture {
|
| public:
|
| - static scoped_ptr<CCScopedTexture> create(CCResourceProvider* resourceProvider) { return make_scoped_ptr(new CCScopedTexture(resourceProvider)); }
|
| - virtual ~CCScopedTexture();
|
| + static scoped_ptr<ScopedTexture> create(ResourceProvider* resourceProvider) { return make_scoped_ptr(new ScopedTexture(resourceProvider)); }
|
| + virtual ~ScopedTexture();
|
|
|
| - using CCTexture::id;
|
| - using CCTexture::size;
|
| - using CCTexture::format;
|
| - using CCTexture::bytes;
|
| + using Texture::id;
|
| + using Texture::size;
|
| + using Texture::format;
|
| + using Texture::bytes;
|
|
|
| - bool allocate(int pool, const IntSize&, GC3Denum format, CCResourceProvider::TextureUsageHint);
|
| + bool allocate(int pool, const IntSize&, GC3Denum format, ResourceProvider::TextureUsageHint);
|
| void free();
|
| void leak();
|
|
|
| protected:
|
| - explicit CCScopedTexture(CCResourceProvider*);
|
| + explicit ScopedTexture(ResourceProvider*);
|
|
|
| private:
|
| - CCResourceProvider* m_resourceProvider;
|
| + ResourceProvider* m_resourceProvider;
|
|
|
| #if !ASSERT_DISABLED
|
| base::PlatformThreadId m_allocateThreadIdentifier;
|
| #endif
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(CCScopedTexture);
|
| + DISALLOW_COPY_AND_ASSIGN(ScopedTexture);
|
| };
|
|
|
| }
|
|
|