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

Unified Diff: cc/CCDelegatedRendererLayerImpl.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 | « no previous file | cc/CCDelegatedRendererLayerImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCDelegatedRendererLayerImpl.h
diff --git a/cc/CCDelegatedRendererLayerImpl.h b/cc/CCDelegatedRendererLayerImpl.h
index 9e197c88957ca432803ed151607d2a21991192a8..7203fafd04e7767ba31229f6d5df1a8f2ae06b08 100644
--- a/cc/CCDelegatedRendererLayerImpl.h
+++ b/cc/CCDelegatedRendererLayerImpl.h
@@ -6,6 +6,7 @@
#define CCDelegatedRendererLayerImpl_h
#include "CCLayerImpl.h"
+#include "cc/scoped_ptr_vector.h"
namespace cc {
@@ -18,7 +19,7 @@ public:
virtual bool hasContributingDelegatedRenderPasses() const OVERRIDE;
// This gives ownership of the RenderPasses to the layer.
- void setRenderPasses(OwnPtrVector<CCRenderPass>&);
+ void setRenderPasses(ScopedPtrVector<CCRenderPass>&);
void clearRenderPasses();
virtual void didLoseContext() OVERRIDE;
@@ -40,8 +41,8 @@ private:
virtual const char* layerTypeAsString() const OVERRIDE;
- OwnPtrVector<CCRenderPass> m_renderPassesInDrawOrder;
- HashMap<CCRenderPass::Id, int> m_renderPassesIndexById;
+ ScopedPtrVector<CCRenderPass> m_renderPassesInDrawOrder;
+ base::hash_map<CCRenderPass::Id, int> m_renderPassesIndexById;
};
}
« no previous file with comments | « no previous file | cc/CCDelegatedRendererLayerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698