| Index: cc/CCProxy.h
|
| diff --git a/cc/CCProxy.h b/cc/CCProxy.h
|
| index 0fc5b5e9a5948fef2190ced9c3152e1213183169..78e8c062c1f0ae65c22199adfdfd76c49b9871b1 100644
|
| --- a/cc/CCProxy.h
|
| +++ b/cc/CCProxy.h
|
| @@ -5,9 +5,9 @@
|
| #ifndef CCProxy_h
|
| #define CCProxy_h
|
|
|
| +#include "base/basictypes.h"
|
| #include "IntRect.h"
|
| #include <public/WebCompositorOutputSurface.h>
|
| -#include <wtf/Noncopyable.h>
|
| #include <wtf/PassOwnPtr.h>
|
| #include <wtf/PassRefPtr.h>
|
|
|
| @@ -20,7 +20,6 @@ struct RendererCapabilities;
|
| // Abstract class responsible for proxying commands from the main-thread side of
|
| // the compositor over to the compositor implementation.
|
| class CCProxy {
|
| - WTF_MAKE_NONCOPYABLE(CCProxy);
|
| public:
|
| static void setMainThread(CCThread*);
|
| static CCThread* mainThread();
|
| @@ -101,6 +100,9 @@ protected:
|
| CCProxy();
|
| friend class DebugScopedSetImplThread;
|
| friend class DebugScopedSetMainThreadBlocked;
|
| +
|
| +private:
|
| + DISALLOW_COPY_AND_ASSIGN(CCProxy);
|
| };
|
|
|
| class DebugScopedSetMainThreadBlocked {
|
|
|