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

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

Issue 23660006: FeatureInfo: Remove allowed_extensions and init workarounds early (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android_webview build Created 7 years, 3 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: 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 e2e3551c9f2e1d91d49072eccca0ad4df0e4aed7..3ce452028f515e4e4ddfc4bc26921fa5d39c6963 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -119,7 +119,7 @@ void GLES2DecoderTestBase::InitDecoder(
// will initialize itself.
mock_decoder_.reset(new MockGLES2Decoder());
EXPECT_TRUE(
- group_->Initialize(mock_decoder_.get(), DisallowedFeatures(), NULL));
+ group_->Initialize(mock_decoder_.get(), DisallowedFeatures()));
AddExpectationsForVertexAttribManager();
@@ -267,9 +267,12 @@ void GLES2DecoderTestBase::InitDecoder(
decoder_.reset(GLES2Decoder::Create(group_.get()));
decoder_->GetLogger()->set_log_synthesized_gl_errors(false);
- decoder_->Initialize(
- surface_, context_, false, surface_->GetSize(), DisallowedFeatures(),
- NULL, attribs);
+ decoder_->Initialize(surface_,
+ context_,
+ false,
+ surface_->GetSize(),
+ DisallowedFeatures(),
+ attribs);
decoder_->MakeCurrent();
decoder_->set_engine(engine_.get());
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_mock.h ('k') | gpu/command_buffer/service/in_process_command_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698