Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3674)

Unified Diff: cc/surfaces/display_scheduler.cc

Issue 1143433005: Remove gfx::FrameTime for a single clock source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handling patch for mac files Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/surfaces/display_scheduler.cc
diff --git a/cc/surfaces/display_scheduler.cc b/cc/surfaces/display_scheduler.cc
index e46031fc5455a312d865d742cb6847f1f7da83f2..6c52b038970926f4bd8f5745b9cec62f46f6817d 100644
--- a/cc/surfaces/display_scheduler.cc
+++ b/cc/surfaces/display_scheduler.cc
@@ -9,7 +9,6 @@
#include "base/stl_util.h"
#include "base/trace_event/trace_event.h"
#include "cc/output/output_surface.h"
-#include "ui/gfx/frame_time.h"
namespace cc {
@@ -115,7 +114,7 @@ void DisplayScheduler::DrawAndSwap() {
}
bool DisplayScheduler::OnBeginFrameMixInDelegate(const BeginFrameArgs& args) {
- base::TimeTicks now = gfx::FrameTime::Now();
+ base::TimeTicks now = base::TimeTicks::Now();
TRACE_EVENT2("cc", "DisplayScheduler::BeginFrame", "args", args.AsValue(),
"now", now);
@@ -234,7 +233,7 @@ void DisplayScheduler::ScheduleBeginFrameDeadline() {
begin_frame_deadline_task_.Reset(begin_frame_deadline_closure_);
base::TimeDelta delta =
- std::max(base::TimeDelta(), desired_deadline - gfx::FrameTime::Now());
+ std::max(base::TimeDelta(), desired_deadline - base::TimeTicks::Now());
task_runner_->PostDelayedTask(FROM_HERE,
begin_frame_deadline_task_.callback(), delta);
TRACE_EVENT2("cc", "Using new deadline", "delta", delta.ToInternalValue(),

Powered by Google App Engine
This is Rietveld 408576698