ui/gl/gpu_timing.cc - Issue 1121463005: Fixit: Split base::TimeTicks --> TimeTicks + ThreadTicks + TraceTicks

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gl/gpu_timing.cc

Issue 1121463005: Fixit: Split base::TimeTicks --> TimeTicks + ThreadTicks + TraceTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More Windows compile fixes. Created 5 years, 8 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: ui/gl/gpu_timing.cc

diff --git a/ui/gl/gpu_timing.cc b/ui/gl/gpu_timing.cc

index ee9049093471973237c85fada92bd5f66300fca4..e227717678ffb6f1fa4e9a5209c6450a1be52b3b 100644

--- a/ui/gl/gpu_timing.cc

+++ b/ui/gl/gpu_timing.cc

@@ -209,7 +209,7 @@ int64 GPUTimingClient::CalculateTimerOffset() {

glGetInteger64v(GL_TIMESTAMP, &gl_now);

int64 now =

cpu_time_for_testing_.is_null()

- ? base::TimeTicks::NowFromSystemTraceTime().ToInternalValue()

+ ? (base::TraceTicks::Now() - base::TraceTicks()).InMicroseconds()

: cpu_time_for_testing_.Run();

offset_ = now - gl_now / base::Time::kNanosecondsPerMicrosecond;

offset_valid_ = timer_type_ == GPUTiming::kTimerTypeARB;

« no previous file with comments | « ui/gl/angle_platform_impl.cc ('k') | no next file » | no next file with comments »