1 files changed, 24 insertions, 24 deletions

diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h
index 34e58d7..41e4dac 100644
--- a/cc/gl_renderer.h
+++ b/cc/gl_renderer.h
@@ -21,21 +21,21 @@ class WebGraphicsContext3D;
 
 namespace cc {
 
-class CCScopedTexture;
-class CCStreamVideoDrawQuad;
-class CCTextureDrawQuad;
+class ScopedTexture;
+class StreamVideoDrawQuad;
+class TextureDrawQuad;
 class GeometryBinding;
 class ScopedEnsureFramebufferAllocation;
 
 // Class that handles drawing of composited render layers using GL.
-class CCRendererGL : public CCDirectRenderer,
+class GLRenderer : public DirectRenderer,
                      public WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM,
                      public WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM ,
                      public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
 public:
-    static scoped_ptr<CCRendererGL> create(CCRendererClient*, CCResourceProvider*);
+    static scoped_ptr<GLRenderer> create(RendererClient*, ResourceProvider*);
 
-    virtual ~CCRendererGL();
+    virtual ~GLRenderer();
 
     virtual const RendererCapabilities& capabilities() const OVERRIDE;
 
@@ -57,7 +57,7 @@ public:
     virtual void setVisible(bool) OVERRIDE;
 
 protected:
-    CCRendererGL(CCRendererClient*, CCResourceProvider*);
+    GLRenderer(RendererClient*, ResourceProvider*);
 
     static void debugGLCall(WebKit::WebGraphicsContext3D*, const char* command, const char* file, int line);
 
@@ -67,16 +67,16 @@ protected:
     const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; }
     const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }
 
-    bool getFramebufferTexture(CCScopedTexture*, const IntRect& deviceRect);
+    bool getFramebufferTexture(ScopedTexture*, const IntRect& deviceRect);
     void releaseRenderPassTextures();
 
     virtual void bindFramebufferToOutputSurface(DrawingFrame&) OVERRIDE;
-    virtual bool bindFramebufferToTexture(DrawingFrame&, const CCScopedTexture*, const gfx::Rect& framebufferRect) OVERRIDE;
+    virtual bool bindFramebufferToTexture(DrawingFrame&, const ScopedTexture*, const gfx::Rect& framebufferRect) OVERRIDE;
     virtual void setDrawViewportSize(const gfx::Size&) OVERRIDE;
     virtual void enableScissorTestRect(const gfx::Rect& scissorRect) OVERRIDE;
     virtual void disableScissorTest() OVERRIDE;
     virtual void clearFramebuffer(DrawingFrame&) OVERRIDE;
-    virtual void drawQuad(DrawingFrame&, const CCDrawQuad*) OVERRIDE;
+    virtual void drawQuad(DrawingFrame&, const DrawQuad*) OVERRIDE;
     virtual void beginDrawingFrame(DrawingFrame&) OVERRIDE;
     virtual void finishDrawingFrame(DrawingFrame&) OVERRIDE;
     virtual bool flippedFramebuffer() const OVERRIDE;
@@ -84,16 +84,16 @@ protected:
 private:
     static void toGLMatrix(float*, const WebKit::WebTransformationMatrix&);
 
-    void drawCheckerboardQuad(const DrawingFrame&, const CCCheckerboardDrawQuad*);
-    void drawDebugBorderQuad(const DrawingFrame&, const CCDebugBorderDrawQuad*);
-    scoped_ptr<CCScopedTexture> drawBackgroundFilters(DrawingFrame&, const CCRenderPassDrawQuad*, const WebKit::WebFilterOperations&, const WebKit::WebTransformationMatrix& deviceTransform);
-    void drawRenderPassQuad(DrawingFrame&, const CCRenderPassDrawQuad*);
-    void drawSolidColorQuad(const DrawingFrame&, const CCSolidColorDrawQuad*);
-    void drawStreamVideoQuad(const DrawingFrame&, const CCStreamVideoDrawQuad*);
-    void drawTextureQuad(const DrawingFrame&, const CCTextureDrawQuad*);
-    void drawIOSurfaceQuad(const DrawingFrame&, const CCIOSurfaceDrawQuad*);
-    void drawTileQuad(const DrawingFrame&, const CCTileDrawQuad*);
-    void drawYUVVideoQuad(const DrawingFrame&, const CCYUVVideoDrawQuad*);
+    void drawCheckerboardQuad(const DrawingFrame&, const CheckerboardDrawQuad*);
+    void drawDebugBorderQuad(const DrawingFrame&, const DebugBorderDrawQuad*);
+    scoped_ptr<ScopedTexture> drawBackgroundFilters(DrawingFrame&, const RenderPassDrawQuad*, const WebKit::WebFilterOperations&, const WebKit::WebTransformationMatrix& deviceTransform);
+    void drawRenderPassQuad(DrawingFrame&, const RenderPassDrawQuad*);
+    void drawSolidColorQuad(const DrawingFrame&, const SolidColorDrawQuad*);
+    void drawStreamVideoQuad(const DrawingFrame&, const StreamVideoDrawQuad*);
+    void drawTextureQuad(const DrawingFrame&, const TextureDrawQuad*);
+    void drawIOSurfaceQuad(const DrawingFrame&, const IOSurfaceDrawQuad*);
+    void drawTileQuad(const DrawingFrame&, const TileDrawQuad*);
+    void drawYUVVideoQuad(const DrawingFrame&, const YUVVideoDrawQuad*);
 
     void setShaderOpacity(float opacity, int alphaLocation);
     void setShaderFloatQuad(const FloatQuad&, int quadLocation);
@@ -101,7 +101,7 @@ private:
 
     void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const gfx::Rect&, const WebKit::WebTransformationMatrix& drawMatrix);
 
-    bool useScopedTexture(DrawingFrame&, const CCScopedTexture*, const gfx::Rect& viewportRect);
+    bool useScopedTexture(DrawingFrame&, const ScopedTexture*, const gfx::Rect& viewportRect);
 
     bool makeContextCurrent();
 
@@ -210,9 +210,9 @@ private:
     bool m_isUsingBindUniform;
     bool m_visible;
 
-    scoped_ptr<CCResourceProvider::ScopedWriteLockGL> m_currentFramebufferLock;
+    scoped_ptr<ResourceProvider::ScopedWriteLockGL> m_currentFramebufferLock;
 
-    DISALLOW_COPY_AND_ASSIGN(CCRendererGL);
+    DISALLOW_COPY_AND_ASSIGN(GLRenderer);
 };
 
 
@@ -222,7 +222,7 @@ private:
 #define DEBUG_GL_CALLS 0
 
 #if DEBUG_GL_CALLS && !defined(NDEBUG)
-#define GLC(context, x) (x, CCRendererGL::debugGLCall(&*context, #x, __FILE__, __LINE__))
+#define GLC(context, x) (x, GLRenderer::debugGLCall(&*context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif