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, 26 insertions, 26 deletions

diff --git a/cc/render_surface_impl.h b/cc/render_surface_impl.h
index 93b4593..972e613 100644
--- a/cc/render_surface_impl.h
+++ b/cc/render_surface_impl.h
@@ -15,32 +15,32 @@
 
 namespace cc {
 
-class DamageTracker;
-class DelegatedRendererLayerImpl;
-class QuadSink;
-class RenderPassSink;
-class LayerImpl;
+class CCDamageTracker;
+class CCDelegatedRendererLayerImpl;
+class CCQuadSink;
+class CCRenderPassSink;
+class CCLayerImpl;
 
-struct AppendQuadsData;
+struct CCAppendQuadsData;
 
-class RenderSurfaceImpl {
+class CCRenderSurface {
 public:
-    explicit RenderSurfaceImpl(LayerImpl*);
-    virtual ~RenderSurfaceImpl();
+    explicit CCRenderSurface(CCLayerImpl*);
+    virtual ~CCRenderSurface();
 
     std::string name() const;
     void dumpSurface(std::string*, int indent) const;
 
     FloatPoint contentRectCenter() const { return FloatRect(m_contentRect).center(); }
 
-    // Returns the rect that encloses the RenderSurfaceImpl including any reflection.
+    // Returns the rect that encloses the RenderSurface including any reflection.
     FloatRect drawableContentRect() const;
 
     float drawOpacity() const { return m_drawOpacity; }
     void setDrawOpacity(float opacity) { m_drawOpacity = opacity; }
 
-    void setNearestAncestorThatMovesPixels(RenderSurfaceImpl* surface) { m_nearestAncestorThatMovesPixels = surface; }
-    const RenderSurfaceImpl* nearestAncestorThatMovesPixels() const { return m_nearestAncestorThatMovesPixels; }
+    void setNearestAncestorThatMovesPixels(CCRenderSurface* surface) { m_nearestAncestorThatMovesPixels = surface; }
+    const CCRenderSurface* nearestAncestorThatMovesPixels() const { return m_nearestAncestorThatMovesPixels; }
 
     bool drawOpacityIsAnimating() const { return m_drawOpacityIsAnimating; }
     void setDrawOpacityIsAnimating(bool drawOpacityIsAnimating) { m_drawOpacityIsAnimating = drawOpacityIsAnimating; }
@@ -70,8 +70,8 @@ public:
     void setContentRect(const IntRect&);
     const IntRect& contentRect() const { return m_contentRect; }
 
-    std::vector<LayerImpl*>& layerList() { return m_layerList; }
-    void addContributingDelegatedRenderPassLayer(LayerImpl*);
+    std::vector<CCLayerImpl*>& layerList() { return m_layerList; }
+    void addContributingDelegatedRenderPassLayer(CCLayerImpl*);
     void clearLayerLists();
 
     int owningLayerId() const;
@@ -80,15 +80,15 @@ public:
     bool surfacePropertyChanged() const;
     bool surfacePropertyChangedOnlyFromDescendant() const;
 
-    DamageTracker* damageTracker() const { return m_damageTracker.get(); }
+    CCDamageTracker* damageTracker() const { return m_damageTracker.get(); }
 
-    RenderPass::Id renderPassId();
+    CCRenderPass::Id renderPassId();
 
-    void appendRenderPasses(RenderPassSink&);
-    void appendQuads(QuadSink&, AppendQuadsData&, bool forReplica, RenderPass::Id renderPassId);
+    void appendRenderPasses(CCRenderPassSink&);
+    void appendQuads(CCQuadSink&, CCAppendQuadsData&, bool forReplica, CCRenderPass::Id renderPassId);
 
 private:
-    LayerImpl* m_owningLayer;
+    CCLayerImpl* m_owningLayer;
 
     // Uses this surface's space.
     IntRect m_contentRect;
@@ -106,22 +106,22 @@ private:
     // Uses the space of the surface's target surface.
     IntRect m_clipRect;
 
-    std::vector<LayerImpl*> m_layerList;
-    std::vector<DelegatedRendererLayerImpl*> m_contributingDelegatedRenderPassLayerList;
+    std::vector<CCLayerImpl*> m_layerList;
+    std::vector<CCDelegatedRendererLayerImpl*> m_contributingDelegatedRenderPassLayerList;
 
     // The nearest ancestor target surface that will contain the contents of this surface, and that is going
     // to move pixels within the surface (such as with a blur). This can point to itself.
-    RenderSurfaceImpl* m_nearestAncestorThatMovesPixels;
+    CCRenderSurface* m_nearestAncestorThatMovesPixels;
 
-    scoped_ptr<DamageTracker> m_damageTracker;
+    scoped_ptr<CCDamageTracker> m_damageTracker;
 
-    // For LayerIteratorActions
+    // For CCLayerIteratorActions
     int m_targetRenderSurfaceLayerIndexHistory;
     int m_currentLayerIndexHistory;
 
-    friend struct LayerIteratorActions;
+    friend struct CCLayerIteratorActions;
 
-    DISALLOW_COPY_AND_ASSIGN(RenderSurfaceImpl);
+    DISALLOW_COPY_AND_ASSIGN(CCRenderSurface);
 };
 
 }