| Index: cc/CCDirectRenderer.h
|
| diff --git a/cc/CCDirectRenderer.h b/cc/CCDirectRenderer.h
|
| index e11d1d744e81db4dc2eaa164995adf06deeb861d..b9db57e749db63c291f79a8758ea0364d95e08ae 100644
|
| --- a/cc/CCDirectRenderer.h
|
| +++ b/cc/CCDirectRenderer.h
|
| @@ -50,7 +50,7 @@ protected:
|
| class CachedTexture : public CCScopedTexture {
|
| WTF_MAKE_NONCOPYABLE(CachedTexture);
|
| public:
|
| - static PassOwnPtr<CachedTexture> create(CCResourceProvider* resourceProvider) { return adoptPtr(new CachedTexture(resourceProvider)); }
|
| + static scoped_ptr<CachedTexture> create(CCResourceProvider* resourceProvider) { return scoped_ptr<CachedTexture>(new CachedTexture(resourceProvider)); }
|
| virtual ~CachedTexture() { }
|
|
|
| bool isComplete() const { return m_isComplete; }
|
| @@ -90,7 +90,7 @@ protected:
|
| virtual void finishDrawingFrame(DrawingFrame&) = 0;
|
| virtual bool flippedFramebuffer() const = 0;
|
|
|
| - HashMap<CCRenderPass::Id, OwnPtr<CachedTexture> > m_renderPassTextures;
|
| + ScopedPtrHashMap<CCRenderPass::Id, CachedTexture> m_renderPassTextures;
|
| CCResourceProvider* m_resourceProvider;
|
| };
|
|
|
|
|