Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1112)

Unified Diff: cc/CCDirectRenderer.h

Issue 10979010: Remove WTF HashMap and PassOwnPtr dependencies for CCRenderPass (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/CCDelegatedRendererLayerImplTest.cpp ('k') | cc/CCDirectRenderer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
};
« no previous file with comments | « cc/CCDelegatedRendererLayerImplTest.cpp ('k') | cc/CCDirectRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698