gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc - Issue 7792008: Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed)

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/gles2_cmd_decoder_unittest_base.cc

Issue 7792008: Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed) (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/

Patch Set: Created 9 years, 4 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 | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h ('k') | gpu/command_buffer/service/program_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

===================================================================

--- gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc (revision 98673)

+++ gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc (working copy)

@@ -55,7 +55,8 @@

false, // has stencil

true, // request alpha

true, // request depth

- false); // request stencil

+ false, // request stencil

+ true); // bind generates resource

}

void GLES2DecoderTestBase::InitDecoder(

@@ -65,11 +66,12 @@

bool has_stencil,

bool request_alpha,

bool request_depth,

- bool request_stencil) {

+ bool request_stencil,

+ bool bind_generates_resource) {

gl_.reset(new StrictMock<MockGLInterface>());

::gfx::GLInterface::SetGLInterface(gl_.get());

surface_manager_.reset(new StrictMock<MockSurfaceManager>);

- group_ = ContextGroup::Ref(new ContextGroup());

+ group_ = ContextGroup::Ref(new ContextGroup(bind_generates_resource));

InSequence sequence;