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

Unified Diff: cc/scheduler/begin_frame_source.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
« no previous file with comments | « cc/resources/resource_update_controller.cc ('k') | cc/scheduler/scheduler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scheduler/begin_frame_source.cc
diff --git a/cc/scheduler/begin_frame_source.cc b/cc/scheduler/begin_frame_source.cc
index 48d834359f43d41fd25b572ce387964f49ee9121..bda51852e5d000a5e24148e1877077f01840f964 100644
--- a/cc/scheduler/begin_frame_source.cc
+++ b/cc/scheduler/begin_frame_source.cc
@@ -12,7 +12,6 @@
#include "base/trace_event/trace_event_argument.h"
#include "cc/scheduler/delay_based_time_source.h"
#include "cc/scheduler/scheduler.h"
-#include "ui/gfx/frame_time.h"
#ifdef NDEBUG
#define DEBUG_FRAMES(...)
@@ -159,7 +158,7 @@ BackToBackBeginFrameSource::~BackToBackBeginFrameSource() {
}
base::TimeTicks BackToBackBeginFrameSource::Now() {
- return gfx::FrameTime::Now();
+ return base::TimeTicks::Now();
}
void BackToBackBeginFrameSource::OnNeedsBeginFramesChange(
@@ -211,7 +210,7 @@ scoped_ptr<SyntheticBeginFrameSource> SyntheticBeginFrameSource::Create(
base::TimeTicks initial_vsync_timebase,
base::TimeDelta initial_vsync_interval) {
scoped_refptr<DelayBasedTimeSource> time_source;
- if (gfx::FrameTime::TimestampsAreHighRes()) {
+ if (base::TimeTicks::IsHighResolution()) {
time_source = DelayBasedTimeSourceHighRes::Create(initial_vsync_interval,
brianderson 2015/05/22 19:20:56 We can also get rid of this if block and remove th
task_runner);
} else {
« no previous file with comments | « cc/resources/resource_update_controller.cc ('k') | cc/scheduler/scheduler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698