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

Unified Diff: gpu/command_buffer/client/gles2_implementation.cc

Issue 1424703003: Kills TraceTicks, which was functionally the same as TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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: gpu/command_buffer/client/gles2_implementation.cc
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index f0b8f8f1335ab0807eb189dffd4747c4a93486cc..50cba65f473f06a79d5a0bc7fe1d4ad7af64ab19 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -771,7 +771,7 @@ bool GLES2Implementation::GetHelper(GLenum pname, GLint* params) {
case GL_TIMESTAMP_EXT:
// We convert all GPU timestamps to CPU time.
*params = base::saturated_cast<GLint>(
- (base::TraceTicks::Now() - base::TraceTicks()).InMicroseconds()
+ (base::TimeTicks::Now() - base::TimeTicks()).InMicroseconds()
* base::Time::kNanosecondsPerMicrosecond);
return true;
case GL_GPU_DISJOINT_EXT:
@@ -1069,7 +1069,7 @@ bool GLES2Implementation::GetInteger64vHelper(GLenum pname, GLint64* params) {
return true;
case GL_TIMESTAMP_EXT:
// We convert all GPU timestamps to CPU time.
- *params = (base::TraceTicks::Now() - base::TraceTicks()).InMicroseconds()
+ *params = (base::TimeTicks::Now() - base::TimeTicks()).InMicroseconds()
* base::Time::kNanosecondsPerMicrosecond;
return true;
default:

Powered by Google App Engine
This is Rietveld 408576698