| Index: cc/CCPrioritizedTexture.h
|
| diff --git a/cc/CCPrioritizedTexture.h b/cc/CCPrioritizedTexture.h
|
| index 519934f15c523e344186b815d351cbf0d62a6d90..3196867064abce966502f6cf012896d3e9770025 100644
|
| --- a/cc/CCPrioritizedTexture.h
|
| +++ b/cc/CCPrioritizedTexture.h
|
| @@ -6,6 +6,7 @@
|
| #define CCPrioritizedTexture_h
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "CCPriorityCalculator.h"
|
| #include "CCResourceProvider.h"
|
| #include "CCTexture.h"
|
| @@ -19,13 +20,13 @@ class CCPrioritizedTextureManager;
|
|
|
| class CCPrioritizedTexture {
|
| public:
|
| - static PassOwnPtr<CCPrioritizedTexture> create(CCPrioritizedTextureManager* manager, IntSize size, GC3Denum format)
|
| + static scoped_ptr<CCPrioritizedTexture> create(CCPrioritizedTextureManager* manager, IntSize size, GC3Denum format)
|
| {
|
| - return adoptPtr(new CCPrioritizedTexture(manager, size, format));
|
| + return make_scoped_ptr(new CCPrioritizedTexture(manager, size, format));
|
| }
|
| - static PassOwnPtr<CCPrioritizedTexture> create(CCPrioritizedTextureManager* manager)
|
| + static scoped_ptr<CCPrioritizedTexture> create(CCPrioritizedTextureManager* manager)
|
| {
|
| - return adoptPtr(new CCPrioritizedTexture(manager, IntSize(), 0));
|
| + return make_scoped_ptr(new CCPrioritizedTexture(manager, IntSize(), 0));
|
| }
|
| ~CCPrioritizedTexture();
|
|
|
|
|