| Index: cc/TextureCopier.h
|
| diff --git a/cc/TextureCopier.h b/cc/TextureCopier.h
|
| index 13d3fbba4f650da204c2ad9c2c0f9a28494db78a..ba8d7bf5e6af9bcad72edbe36f0941ba08131252 100644
|
| --- a/cc/TextureCopier.h
|
| +++ b/cc/TextureCopier.h
|
| @@ -5,12 +5,12 @@
|
| #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>
|
| -#include <wtf/Noncopyable.h>
|
|
|
| namespace WebKit {
|
| class WebGraphicsContext3D;
|
| @@ -38,7 +38,6 @@ public:
|
| #if USE(ACCELERATED_COMPOSITING)
|
|
|
| class AcceleratedTextureCopier : public TextureCopier {
|
| - WTF_MAKE_NONCOPYABLE(AcceleratedTextureCopier);
|
| public:
|
| static PassOwnPtr<AcceleratedTextureCopier> create(WebKit::WebGraphicsContext3D* context, bool usingBindUniforms)
|
| {
|
| @@ -60,6 +59,8 @@ private:
|
| Platform3DObject m_positionBuffer;
|
| OwnPtr<BlitProgram> m_blitProgram;
|
| bool m_usingBindUniforms;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(AcceleratedTextureCopier);
|
| };
|
|
|
| #endif // USE(ACCELERATED_COMPOSITING)
|
|
|