| Index: cc/CCScopedTexture.h
|
| diff --git a/cc/CCScopedTexture.h b/cc/CCScopedTexture.h
|
| index a5b615c6e7c08a60ff6a5e46468fb4de970d9c2f..faa11f5e9dcd020078317d912b63111bff793b1c 100644
|
| --- a/cc/CCScopedTexture.h
|
| +++ b/cc/CCScopedTexture.h
|
| @@ -2,45 +2,5 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CCScopedTexture_h
|
| -#define CCScopedTexture_h
|
| -
|
| -#include "base/basictypes.h"
|
| -#include "CCTexture.h"
|
| -
|
| -#if !ASSERT_DISABLED
|
| -#include "base/threading/platform_thread.h"
|
| -#endif
|
| -
|
| -namespace cc {
|
| -
|
| -class CCScopedTexture : protected CCTexture {
|
| -public:
|
| - static PassOwnPtr<CCScopedTexture> create(CCResourceProvider* resourceProvider) { return adoptPtr(new CCScopedTexture(resourceProvider)); }
|
| - virtual ~CCScopedTexture();
|
| -
|
| - using CCTexture::id;
|
| - using CCTexture::size;
|
| - using CCTexture::format;
|
| - using CCTexture::bytes;
|
| -
|
| - bool allocate(int pool, const IntSize&, GC3Denum format, CCResourceProvider::TextureUsageHint);
|
| - void free();
|
| - void leak();
|
| -
|
| -protected:
|
| - explicit CCScopedTexture(CCResourceProvider*);
|
| -
|
| -private:
|
| - CCResourceProvider* m_resourceProvider;
|
| -
|
| -#if !ASSERT_DISABLED
|
| - base::PlatformThreadId m_allocateThreadIdentifier;
|
| -#endif
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(CCScopedTexture);
|
| -};
|
| -
|
| -}
|
| -
|
| -#endif
|
| +// Temporary forwarding header
|
| +#include "cc/scoped_texture.h"
|
|
|