gpu/command_buffer/service/gpu_tracer_unittest.cc - Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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: gpu/command_buffer/service/gpu_tracer_unittest.cc

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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:

Index: gpu/command_buffer/service/gpu_tracer_unittest.cc

diff --git a/gpu/command_buffer/service/gpu_tracer_unittest.cc b/gpu/command_buffer/service/gpu_tracer_unittest.cc

index ba61ba38d8f2420403b0d144f2dddea548983d37..900542193cc3e999b9535cbe9ccccfebe8e83962 100644

--- a/gpu/command_buffer/service/gpu_tracer_unittest.cc

+++ b/gpu/command_buffer/service/gpu_tracer_unittest.cc

@@ -356,7 +356,6 @@ class BaseGpuTraceTest : public BaseGpuTest {

// Shouldn't be available before End() call

gl_fake_queries_.SetCurrentGLTime(end_timestamp);

- g_fakeCPUTime = expect_end_time;

EXPECT_FALSE(trace->IsAvailable());

trace->End(true);

@@ -475,7 +474,7 @@ class BaseGpuTracerTest : public BaseGpuTest {

gl_fake_queries_.SetCurrentGLTime(

end_timestamp +

(i * base::Time::kNanosecondsPerMicrosecond));

- g_fakeCPUTime = expect_end_time + i;

+ g_fakeCPUTime = expect_start_time + i;

// Each trace name should be different to differentiate.

const char num_char = static_cast<char>('0' + i);