Revert "cc: Rename cc classes and members to match filenames"

This reverts commit 184fac5add06d5f4670fa6be4a4d3b39232d51bb.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163059 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 13 deletions

diff --git a/cc/delegated_renderer_layer_impl.h b/cc/delegated_renderer_layer_impl.h
index 36040aa00..5487d02 100644
--- a/cc/delegated_renderer_layer_impl.h
+++ b/cc/delegated_renderer_layer_impl.h
@@ -10,37 +10,37 @@
 
 namespace cc {
 
-class DelegatedRendererLayerImpl : public LayerImpl {
+class CCDelegatedRendererLayerImpl : public CCLayerImpl {
 public:
-    static scoped_ptr<DelegatedRendererLayerImpl> create(int id) { return make_scoped_ptr(new DelegatedRendererLayerImpl(id)); }
-    virtual ~DelegatedRendererLayerImpl();
+    static scoped_ptr<CCDelegatedRendererLayerImpl> create(int id) { return make_scoped_ptr(new CCDelegatedRendererLayerImpl(id)); }
+    virtual ~CCDelegatedRendererLayerImpl();
 
     virtual bool descendantDrawsContent() OVERRIDE;
     virtual bool hasContributingDelegatedRenderPasses() const OVERRIDE;
 
     // This gives ownership of the RenderPasses to the layer.
-    void setRenderPasses(ScopedPtrVector<RenderPass>&);
+    void setRenderPasses(ScopedPtrVector<CCRenderPass>&);
     void clearRenderPasses();
 
     virtual void didLoseContext() OVERRIDE;
 
-    virtual RenderPass::Id firstContributingRenderPassId() const OVERRIDE;
-    virtual RenderPass::Id nextContributingRenderPassId(RenderPass::Id) const OVERRIDE;
+    virtual CCRenderPass::Id firstContributingRenderPassId() const OVERRIDE;
+    virtual CCRenderPass::Id nextContributingRenderPassId(CCRenderPass::Id) const OVERRIDE;
 
-    void appendContributingRenderPasses(RenderPassSink&);
-    virtual void appendQuads(QuadSink&, AppendQuadsData&) OVERRIDE;
+    void appendContributingRenderPasses(CCRenderPassSink&);
+    virtual void appendQuads(CCQuadSink&, CCAppendQuadsData&) OVERRIDE;
 
 private:
-    explicit DelegatedRendererLayerImpl(int);
+    explicit CCDelegatedRendererLayerImpl(int);
 
-    RenderPass::Id convertDelegatedRenderPassId(RenderPass::Id delegatedRenderPassId) const;
+    CCRenderPass::Id convertDelegatedRenderPassId(CCRenderPass::Id delegatedRenderPassId) const;
 
-    void appendRenderPassQuads(QuadSink&, AppendQuadsData&, RenderPass* fromDelegatedRenderPass) const;
+    void appendRenderPassQuads(CCQuadSink&, CCAppendQuadsData&, CCRenderPass* fromDelegatedRenderPass) const;
 
     virtual const char* layerTypeAsString() const OVERRIDE;
 
-    ScopedPtrVector<RenderPass> m_renderPassesInDrawOrder;
-    base::hash_map<RenderPass::Id, int> m_renderPassesIndexById;
+    ScopedPtrVector<CCRenderPass> m_renderPassesInDrawOrder;
+    base::hash_map<CCRenderPass::Id, int> m_renderPassesIndexById;
 };
 
 }