| Index: cc/scoped_texture.cc
|
| diff --git a/cc/scoped_texture.cc b/cc/scoped_texture.cc
|
| index d43ebe33019e1af0237353540c75736cd3c33db7..8ea0a362ee4fd4d2a9bda985861ce58537f5e19f 100644
|
| --- a/cc/scoped_texture.cc
|
| +++ b/cc/scoped_texture.cc
|
| @@ -8,18 +8,18 @@
|
|
|
| namespace cc {
|
|
|
| -CCScopedTexture::CCScopedTexture(CCResourceProvider* resourceProvider)
|
| +ScopedTexture::ScopedTexture(ResourceProvider* resourceProvider)
|
| : m_resourceProvider(resourceProvider)
|
| {
|
| ASSERT(m_resourceProvider);
|
| }
|
|
|
| -CCScopedTexture::~CCScopedTexture()
|
| +ScopedTexture::~ScopedTexture()
|
| {
|
| free();
|
| }
|
|
|
| -bool CCScopedTexture::allocate(int pool, const IntSize& size, GC3Denum format, CCResourceProvider::TextureUsageHint hint)
|
| +bool ScopedTexture::allocate(int pool, const IntSize& size, GC3Denum format, ResourceProvider::TextureUsageHint hint)
|
| {
|
| ASSERT(!id());
|
| ASSERT(!size.isEmpty());
|
| @@ -34,7 +34,7 @@ bool CCScopedTexture::allocate(int pool, const IntSize& size, GC3Denum format, C
|
| return id();
|
| }
|
|
|
| -void CCScopedTexture::free()
|
| +void ScopedTexture::free()
|
| {
|
| if (id()) {
|
| ASSERT(m_allocateThreadIdentifier == base::PlatformThread::CurrentId());
|
| @@ -43,7 +43,7 @@ void CCScopedTexture::free()
|
| setId(0);
|
| }
|
|
|
| -void CCScopedTexture::leak()
|
| +void ScopedTexture::leak()
|
| {
|
| setId(0);
|
| }
|
|
|