| Index: cc/CCScheduler.h
|
| diff --git a/cc/CCScheduler.h b/cc/CCScheduler.h
|
| index ce3609d565544cba3f176cd3e53d84061f726959..cc19b61c8df92004a81eb29cfa61dd1b748c948d 100644
|
| --- a/cc/CCScheduler.h
|
| +++ b/cc/CCScheduler.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef CCScheduler_h
|
| #define CCScheduler_h
|
|
|
| +#include "base/basictypes.h"
|
| +#include "base/time.h"
|
| #include "CCFrameRateController.h"
|
| #include "CCSchedulerStateMachine.h"
|
| -#include "base/time.h"
|
| -#include <wtf/Noncopyable.h>
|
| #include <wtf/PassOwnPtr.h>
|
|
|
| namespace cc {
|
| @@ -45,7 +45,6 @@ protected:
|
| };
|
|
|
| class CCScheduler : CCFrameRateControllerClient {
|
| - WTF_MAKE_NONCOPYABLE(CCScheduler);
|
| public:
|
| static PassOwnPtr<CCScheduler> create(CCSchedulerClient* client, PassOwnPtr<CCFrameRateController> frameRateController)
|
| {
|
| @@ -100,6 +99,8 @@ private:
|
| OwnPtr<CCFrameRateController> m_frameRateController;
|
| CCSchedulerStateMachine m_stateMachine;
|
| bool m_insideProcessScheduledActions;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(CCScheduler);
|
| };
|
|
|
| }
|
|
|