| Index: cc/output/output_surface.cc
|
| diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
|
| index 002a44a37eb3f2a5f3ceaa437d959f006402321b..1ae5fe12596a8ee68b3bd6604ba0063fb25ddcb2 100644
|
| --- a/cc/output/output_surface.cc
|
| +++ b/cc/output/output_surface.cc
|
| @@ -97,7 +97,7 @@ void OutputSurface::InitializeBeginImplFrameEmulation(
|
| base::TimeDelta interval) {
|
| if (throttle_frame_production) {
|
| scoped_refptr<DelayBasedTimeSource> time_source;
|
| - if (gfx::FrameTime::TimestampsAreHighRes())
|
| + if (gfx::FrameTime::IsHighRes())
|
| time_source = DelayBasedTimeSourceHighRes::Create(interval, task_runner);
|
| else
|
| time_source = DelayBasedTimeSource::Create(interval, task_runner);
|
| @@ -179,10 +179,10 @@ void OutputSurface::BeginImplFrame(const BeginFrameArgs& args) {
|
| }
|
| }
|
|
|
| -base::TimeTicks OutputSurface::RetroactiveBeginImplFrameDeadline() {
|
| +gfx::FrameTime OutputSurface::RetroactiveBeginImplFrameDeadline() {
|
| // TODO(brianderson): Remove the alternative deadline once we have better
|
| // deadline estimations.
|
| - base::TimeTicks alternative_deadline =
|
| + gfx::FrameTime alternative_deadline =
|
| skipped_begin_impl_frame_args_.frame_time +
|
| BeginFrameArgs::DefaultRetroactiveBeginFramePeriod();
|
| return std::max(skipped_begin_impl_frame_args_.deadline,
|
|
|