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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

Issue 6623063: Connect up --disable-gl-multisampling to command buffer (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix style. Created 9 years, 9 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_mock.h ('k') | gpu/command_buffer/service/gpu_processor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index 18a920f324a099a48a4201d92908c7ba8c288cb3..0699e3bf717cb7874a76d82ce0e396bad5b0267b 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -57,9 +57,10 @@ void GLES2DecoderTestBase::InitDecoder(
InSequence sequence;
- TestHelper::SetupContextGroupInitExpectations(gl_.get(), extensions);
+ TestHelper::SetupContextGroupInitExpectations(gl_.get(),
+ DisallowedExtensions(), extensions);
- EXPECT_TRUE(group_->Initialize(extensions));
+ EXPECT_TRUE(group_->Initialize(DisallowedExtensions(), extensions));
EXPECT_CALL(*gl_, GetIntegerv(GL_ALPHA_BITS, _))
.WillOnce(SetArgumentPointee<1>(has_alpha_backbuffer ? 8 : 0))
@@ -129,7 +130,8 @@ void GLES2DecoderTestBase::InitDecoder(
decoder_.reset(GLES2Decoder::Create(group_.get()));
decoder_->Initialize(
- context_, context_->GetSize(), NULL, std::vector<int32>(), NULL, 0);
+ context_, context_->GetSize(), DisallowedExtensions(),
+ NULL, std::vector<int32>(), NULL, 0);
decoder_->set_engine(engine_.get());
EXPECT_CALL(*gl_, GenBuffersARB(_, _))
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_mock.h ('k') | gpu/command_buffer/service/gpu_processor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698