| Index: cc/output/begin_frame_args.cc
|
| diff --git a/cc/output/begin_frame_args.cc b/cc/output/begin_frame_args.cc
|
| index cefb22bdc1382aa20f6217a5f077fad39d5daa98..5239d44ea59d9644b63fefbd205b7ecd41abb7b3 100644
|
| --- a/cc/output/begin_frame_args.cc
|
| +++ b/cc/output/begin_frame_args.cc
|
| @@ -49,9 +49,7 @@ BeginFrameArgs BeginFrameArgs::CreateExpiredForTesting() {
|
| }
|
|
|
| base::TimeDelta BeginFrameArgs::DefaultDeadlineAdjustment() {
|
| - // Using a large deadline adjustment will effectively revert BeginFrame
|
| - // scheduling to the hard vsync scheduling we used to have.
|
| - return base::TimeDelta::FromSeconds(-1);
|
| + return base::TimeDelta::FromMicroseconds(-16666/3);
|
| }
|
|
|
| base::TimeDelta BeginFrameArgs::DefaultInterval() {
|
| @@ -63,4 +61,14 @@ base::TimeDelta BeginFrameArgs::DefaultRetroactiveBeginFramePeriod() {
|
| }
|
|
|
|
|
| +void BeginFrameArgs::AdjustDeadline(base::TimeDelta delta) {
|
| +#if defined(OS_ANDROID)
|
| + deadline += delta;
|
| +#else
|
| + //deadline += delta;
|
| + deadline = base::TimeTicks();
|
| +#endif
|
| +}
|
| +
|
| +
|
| } // namespace cc
|
|
|