| Index: cc/scheduler/scheduler.cc
|
| diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc
|
| index 88c8c74f701d2f4aa0a8980cff8b01f2a21335ea..49b56d840e2b450ee31dcc70ba00af0d7400c8e7 100644
|
| --- a/cc/scheduler/scheduler.cc
|
| +++ b/cc/scheduler/scheduler.cc
|
| @@ -7,9 +7,9 @@
|
| #include <algorithm>
|
| #include "base/auto_reset.h"
|
| #include "base/debug/trace_event.h"
|
| +#include "base/debug/traced_value.h"
|
| #include "base/logging.h"
|
| #include "cc/debug/devtools_instrumentation.h"
|
| -#include "cc/debug/traced_value.h"
|
| #include "cc/scheduler/delay_based_time_source.h"
|
| #include "ui/gfx/frame_time.h"
|
|
|
| @@ -630,7 +630,7 @@ void Scheduler::ProcessScheduledActions() {
|
| TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("cc.debug.scheduler"),
|
| "SchedulerStateMachine",
|
| "state",
|
| - TracedValue::FromValue(StateAsValue().release()));
|
| + base::debug::TracedValue::FromValue(StateAsValue().release()));
|
| state_machine_.UpdateState(action);
|
| base::AutoReset<SchedulerStateMachine::Action>
|
| mark_inside_action(&inside_action_, action);
|
| @@ -742,7 +742,7 @@ bool Scheduler::CanCommitAndActivateBeforeDeadline() const {
|
| "time_left_after_drawing_ms",
|
| (begin_impl_frame_args_.deadline - estimated_draw_time).InMillisecondsF(),
|
| "state",
|
| - TracedValue::FromValue(StateAsValue().release()));
|
| + base::debug::TracedValue::FromValue(StateAsValue().release()));
|
|
|
| return estimated_draw_time < begin_impl_frame_args_.deadline;
|
| }
|
|
|