Move TextureCopier and TextureUploader from CCRenderer to CCResourceProvider

cc/CCRendererGL.h

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 #ifndef CCRendererGL_h
 #define CCRendererGL_h
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "CCCheckerboardDrawQuad.h"
 #include "CCDebugBorderDrawQuad.h"
 #include "CCDirectRenderer.h"
 #include "CCIOSurfaceDrawQuad.h"
 #include "CCRenderPassDrawQuad.h"
 #include "CCRenderer.h"
 #include "CCSolidColorDrawQuad.h"
 #include "CCStreamVideoDrawQuad.h"
 #include "CCTextureDrawQuad.h"
 #include "CCTileDrawQuad.h"
 #include "CCYUVVideoDrawQuad.h"
 #include "Extensions3DChromium.h"
-#include "TextureCopier.h"
 #include <wtf/PassOwnPtr.h>
 
 namespace WebKit {
 class WebGraphicsContext3D;
 }
 
 namespace cc {
 
 class CCScopedTexture;
 class GeometryBinding;
 class ScopedEnsureFramebufferAllocation;
 
 // Class that handles drawing of composited render layers using GL.
 class CCRendererGL : public CCDirectRenderer,
                      public WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM,
                      public WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM ,
                      public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
     WTF_MAKE_NONCOPYABLE(CCRendererGL);
 public:
-    static PassOwnPtr<CCRendererGL> create(CCRendererClient*, CCResourceProvider*, TextureUploaderOption);
+    static PassOwnPtr<CCRendererGL> create(CCRendererClient*, CCResourceProvider*);
 
     virtual ~CCRendererGL();
 
     virtual const RendererCapabilities& capabilities() const OVERRIDE { return m_capabilities; }
 
     WebKit::WebGraphicsContext3D* context();
 
     virtual void viewportChanged() OVERRIDE;
 
     const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; }
 
     // waits for rendering to finish
     virtual void finish() OVERRIDE;
 
     virtual void doNoOp() OVERRIDE;
     // puts backbuffer onscreen
     virtual bool swapBuffers() OVERRIDE;
 
     static void debugGLCall(WebKit::WebGraphicsContext3D*, const char* command, const char* file, int line);
 
     const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }
 
     virtual void getFramebufferPixels(void *pixels, const IntRect&) OVERRIDE;
     bool getFramebufferTexture(CCScopedTexture*, const IntRect& deviceRect);
 
-    virtual TextureCopier* textureCopier() const OVERRIDE { return m_textureCopier.get(); }
-    virtual TextureUploader* textureUploader() const OVERRIDE { return m_textureUploader.get(); }
-
     virtual bool isContextLost() OVERRIDE;
 
     virtual void setVisible(bool) OVERRIDE;
 
 protected:
-    CCRendererGL(CCRendererClient*, CCResourceProvider*, TextureUploaderOption);
+    CCRendererGL(CCRendererClient*, CCResourceProvider*);
 
     bool isFramebufferDiscarded() const { return m_isFramebufferDiscarded; }
     bool initialize();
 
     void releaseRenderPassTextures();
 
     virtual void bindFramebufferToOutputSurface(DrawingFrame&) OVERRIDE;
     virtual bool bindFramebufferToTexture(DrawingFrame&, const CCScopedTexture*, const IntRect& framebufferRect) OVERRIDE;
     virtual void setDrawViewportSize(const IntSize&) OVERRIDE;
     virtual void enableScissorTestRect(const IntRect& scissorRect) OVERRIDE;
@@ skipping 115 matching lines @@
 
     OwnPtr<TextureProgram> m_textureProgram;
     OwnPtr<TextureProgramFlip> m_textureProgramFlip;
     OwnPtr<TextureIOSurfaceProgram> m_textureIOSurfaceProgram;
 
     OwnPtr<VideoYUVProgram> m_videoYUVProgram;
     OwnPtr<VideoStreamTextureProgram> m_videoStreamTextureProgram;
 
     OwnPtr<SolidColorProgram> m_solidColorProgram;
 
-    OwnPtr<AcceleratedTextureCopier> m_textureCopier;
-    OwnPtr<TextureUploader> m_textureUploader;
-
     WebKit::WebGraphicsContext3D* m_context;
 
     IntRect m_swapBufferRect;
     bool m_isViewportChanged;
     bool m_isFramebufferDiscarded;
     bool m_isUsingBindUniform;
     bool m_visible;
-    TextureUploaderOption m_textureUploaderSetting;
 
     OwnPtr<CCResourceProvider::ScopedWriteLockGL> m_currentFramebufferLock;
 };
 
 
 // Setting DEBUG_GL_CALLS to 1 will call glGetError() after almost every GL
 // call made by the compositor. Useful for debugging rendering issues but
 // will significantly degrade performance.
 #define DEBUG_GL_CALLS 0
 
 #if DEBUG_GL_CALLS && !defined ( NDEBUG )
 #define GLC(context, x) (x, CCRendererGL::debugGLCall(&*context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif
 
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
 #endif