| Index: cc/CCPrioritizedTextureManager.h
|
| diff --git a/cc/CCPrioritizedTextureManager.h b/cc/CCPrioritizedTextureManager.h
|
| index 88a4f45fcfb176186078e1ce0db5b425e4daf285..432322f394d62fb78e97e66750a296fd5da54458 100644
|
| --- a/cc/CCPrioritizedTextureManager.h
|
| +++ b/cc/CCPrioritizedTextureManager.h
|
| @@ -6,6 +6,7 @@
|
| #define CCPrioritizedTextureManager_h
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "CCPrioritizedTexture.h"
|
| #include "CCPriorityCalculator.h"
|
| #include "CCTexture.h"
|
| @@ -23,13 +24,13 @@ class CCPriorityCalculator;
|
|
|
| class CCPrioritizedTextureManager {
|
| public:
|
| - static PassOwnPtr<CCPrioritizedTextureManager> create(size_t maxMemoryLimitBytes, int maxTextureSize, int pool)
|
| + static scoped_ptr<CCPrioritizedTextureManager> create(size_t maxMemoryLimitBytes, int maxTextureSize, int pool)
|
| {
|
| - return adoptPtr(new CCPrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool));
|
| + return make_scoped_ptr(new CCPrioritizedTextureManager(maxMemoryLimitBytes, maxTextureSize, pool));
|
| }
|
| - PassOwnPtr<CCPrioritizedTexture> createTexture(IntSize size, GC3Denum format)
|
| + scoped_ptr<CCPrioritizedTexture> createTexture(IntSize size, GC3Denum format)
|
| {
|
| - return adoptPtr(new CCPrioritizedTexture(this, size, format));
|
| + return make_scoped_ptr(new CCPrioritizedTexture(this, size, format));
|
| }
|
| ~CCPrioritizedTextureManager();
|
|
|
|
|