| Index: cc/output/begin_frame_args.cc
|
| diff --git a/cc/output/begin_frame_args.cc b/cc/output/begin_frame_args.cc
|
| index b45eee8c111e504518a90cd02f0f198d84efbe9d..4d1b27014298ef9aca3efa06901ed5526ed787a9 100644
|
| --- a/cc/output/begin_frame_args.cc
|
| +++ b/cc/output/begin_frame_args.cc
|
| @@ -3,8 +3,6 @@
|
| // found in the LICENSE file.
|
|
|
| #include "cc/output/begin_frame_args.h"
|
| -
|
| -#include "base/debug/trace_event_argument.h"
|
| #include "ui/gfx/frame_time.h"
|
|
|
| namespace cc {
|
| @@ -29,19 +27,13 @@
|
| return BeginFrameArgs(frame_time, deadline, interval);
|
| }
|
|
|
| -scoped_refptr<base::debug::ConvertableToTraceFormat> BeginFrameArgs::AsValue()
|
| - const {
|
| - scoped_refptr<base::debug::TracedValue> state =
|
| - new base::debug::TracedValue();
|
| - AsValueInto(state.get());
|
| - return state;
|
| -}
|
| -
|
| -void BeginFrameArgs::AsValueInto(base::debug::TracedValue* state) const {
|
| +scoped_ptr<base::Value> BeginFrameArgs::AsValue() const {
|
| + scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue);
|
| state->SetString("type", "BeginFrameArgs");
|
| state->SetDouble("frame_time_us", frame_time.ToInternalValue());
|
| state->SetDouble("deadline_us", deadline.ToInternalValue());
|
| state->SetDouble("interval_us", interval.InMicroseconds());
|
| + return state.PassAs<base::Value>();
|
| }
|
|
|
| BeginFrameArgs BeginFrameArgs::CreateForSynchronousCompositor(
|
|
|