| Index: cc/scheduler/scheduler.h
|
| diff --git a/cc/scheduler/scheduler.h b/cc/scheduler/scheduler.h
|
| index afb9e9d0e8e54ec6f689d13ee2c0333b9deeef9c..3653c30cb014e0cce4e6d1c253eef9cc0d9c0ff2 100644
|
| --- a/cc/scheduler/scheduler.h
|
| +++ b/cc/scheduler/scheduler.h
|
| @@ -20,9 +20,6 @@
|
| #include "cc/scheduler/scheduler_state_machine.h"
|
|
|
| namespace base {
|
| -namespace debug {
|
| -class ConvertableToTraceFormat;
|
| -}
|
| class SingleThreadTaskRunner;
|
| }
|
|
|
| @@ -132,7 +129,7 @@
|
| void PollForAnticipatedDrawTriggers();
|
| void PollToAdvanceCommitState();
|
|
|
| - scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const;
|
| + scoped_ptr<base::Value> AsValue() const;
|
|
|
| bool IsInsideAction(SchedulerStateMachine::Action action) {
|
| return inside_action_ == action;
|
| @@ -164,7 +161,7 @@
|
| // TimeSourceClient implementation of OnTimerTick triggers a BeginFrame.
|
| virtual void OnTimerTick() OVERRIDE;
|
|
|
| - void AsValueInto(base::debug::TracedValue* dict) const;
|
| + scoped_ptr<base::Value> AsValue() const;
|
|
|
| private:
|
| BeginFrameArgs CreateSyntheticBeginFrameArgs(base::TimeTicks frame_time);
|
|
|