gpu/command_buffer/service/gpu_tracer_unittest.cc - Issue 871763002: Make GL bindings conditional

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 871763002: Make GL bindings conditional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments, try fix broken builds Created 5 years, 11 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 1b55e785e4517576c002fbd6fc90183d4582c150..30067b6eb4b002e5e076e8f215927cb9eef6cf95 100644

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

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

@@ -225,7 +225,10 @@ class BaseGpuTest : public GpuServiceTest {

protected:

void SetUp() override {

- GpuServiceTest::SetUp();

+ // TODO: The tracer code is wrong and assumes that getInteger64v

Ken Russell (switch to Gerrit) 2015/01/24 05:08:04 Add owner for TODO.

no sievers 2015/01/26 21:13:02 Done.

+ // is available when timer_query or disjoint_timer exists.

+ GpuServiceTest::SetUpWithGLVersion(

+ "3.2", "GL_EXT_disjoint_timer_query GL_ARB_timer_query");

gl_fake_queries_.Reset();

gl_surface_ = new gfx::GLSurfaceStub();

gl_context_ = new gfx::GLContextStub();