| Index: cc/TextureCopier.h
|
| diff --git a/cc/TextureCopier.h b/cc/TextureCopier.h
|
| index ba8d7bf5e6af9bcad72edbe36f0941ba08131252..de210fe65ab359b166f5f608a9ed00e5da6d8aff 100644
|
| --- a/cc/TextureCopier.h
|
| +++ b/cc/TextureCopier.h
|
| @@ -2,69 +2,5 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef TextureCopier_h
|
| -#define TextureCopier_h
|
| -
|
| -#include "base/basictypes.h"
|
| -#include "GraphicsContext3D.h"
|
| -#include "ProgramBinding.h"
|
| -#include "ShaderChromium.h"
|
| -#include <wtf/OwnPtr.h>
|
| -#include <wtf/PassOwnPtr.h>
|
| -
|
| -namespace WebKit {
|
| -class WebGraphicsContext3D;
|
| -}
|
| -
|
| -namespace cc {
|
| -class IntSize;
|
| -
|
| -class TextureCopier {
|
| -public:
|
| - struct Parameters {
|
| - unsigned sourceTexture;
|
| - unsigned destTexture;
|
| - IntSize size;
|
| - };
|
| - // Copy the base level contents of |sourceTexture| to |destTexture|. Both texture objects
|
| - // must be complete and have a base level of |size| dimensions. The color formats do not need
|
| - // to match, but |destTexture| must have a renderable format.
|
| - virtual void copyTexture(Parameters) = 0;
|
| - virtual void flush() = 0;
|
| -
|
| - virtual ~TextureCopier() { }
|
| -};
|
| -
|
| -#if USE(ACCELERATED_COMPOSITING)
|
| -
|
| -class AcceleratedTextureCopier : public TextureCopier {
|
| -public:
|
| - static PassOwnPtr<AcceleratedTextureCopier> create(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms)
|
| - {
|
| - return adoptPtr(new AcceleratedTextureCopier(context, usingBindUniforms));
|
| - }
|
| - virtual ~AcceleratedTextureCopier();
|
| -
|
| - virtual void copyTexture(Parameters) OVERRIDE;
|
| - virtual void flush() OVERRIDE;
|
| -
|
| -protected:
|
| - AcceleratedTextureCopier(WebKit::WebGraphicsContext3D*, bool usingBindUniforms);
|
| -
|
| -private:
|
| - typedef ProgramBinding<VertexShaderPosTexIdentity, FragmentShaderRGBATex> BlitProgram;
|
| -
|
| - WebKit::WebGraphicsContext3D* m_context;
|
| - Platform3DObject m_fbo;
|
| - Platform3DObject m_positionBuffer;
|
| - OwnPtr<BlitProgram> m_blitProgram;
|
| - bool m_usingBindUniforms;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(AcceleratedTextureCopier);
|
| -};
|
| -
|
| -#endif // USE(ACCELERATED_COMPOSITING)
|
| -
|
| -}
|
| -
|
| -#endif
|
| +// Temporary forwarding header
|
| +#include "cc/texture_copier.h"
|
|
|