Index: cc/output/begin_frame_args.cc |
diff --git a/cc/output/begin_frame_args.cc b/cc/output/begin_frame_args.cc |
index 92901afb1f3d897b37ca374297a8e5bc25463cbc..c7b05e597a20adb95c295319d05138849bbfee0d 100644 |
--- a/cc/output/begin_frame_args.cc |
+++ b/cc/output/begin_frame_args.cc |
@@ -8,21 +8,21 @@ |
namespace cc { |
BeginFrameArgs::BeginFrameArgs() |
- : frame_time(base::TimeTicks()), |
- deadline(base::TimeTicks()), |
+ : frame_time(gfx::FrameTime()), |
+ deadline(gfx::FrameTime()), |
interval(base::TimeDelta::FromMicroseconds(-1)) { |
} |
-BeginFrameArgs::BeginFrameArgs(base::TimeTicks frame_time, |
- base::TimeTicks deadline, |
+BeginFrameArgs::BeginFrameArgs(gfx::FrameTime frame_time, |
+ gfx::FrameTime deadline, |
base::TimeDelta interval) |
: frame_time(frame_time), |
deadline(deadline), |
interval(interval) |
{} |
-BeginFrameArgs BeginFrameArgs::Create(base::TimeTicks frame_time, |
- base::TimeTicks deadline, |
+BeginFrameArgs BeginFrameArgs::Create(gfx::FrameTime frame_time, |
+ gfx::FrameTime deadline, |
base::TimeDelta interval) { |
return BeginFrameArgs(frame_time, deadline, interval); |
} |
@@ -31,19 +31,19 @@ BeginFrameArgs BeginFrameArgs::CreateForSynchronousCompositor() { |
// For WebView/SynchronousCompositor, we always want to draw immediately, |
// so we set the deadline to 0 and guess that the interval is 16 milliseconds. |
return BeginFrameArgs(gfx::FrameTime::Now(), |
- base::TimeTicks(), |
+ gfx::FrameTime(), |
DefaultInterval()); |
} |
BeginFrameArgs BeginFrameArgs::CreateForTesting() { |
- base::TimeTicks now = gfx::FrameTime::Now(); |
+ gfx::FrameTime now = gfx::FrameTime::Now(); |
return BeginFrameArgs(now, |
now + (DefaultInterval() / 2), |
DefaultInterval()); |
} |
BeginFrameArgs BeginFrameArgs::CreateExpiredForTesting() { |
- base::TimeTicks now = gfx::FrameTime::Now(); |
+ gfx::FrameTime now = gfx::FrameTime::Now(); |
return BeginFrameArgs(now, |
now - DefaultInterval(), |
DefaultInterval()); |