| Index: gpu/command_buffer/service/gpu_processor.cc
|
| diff --git a/gpu/command_buffer/service/gpu_processor.cc b/gpu/command_buffer/service/gpu_processor.cc
|
| index b36db6af7ae6e34fe74902065d96111ea8970b8f..45d21d7bd7a320cb5d20e17c1994a02ddb9b0bf7 100644
|
| --- a/gpu/command_buffer/service/gpu_processor.cc
|
| +++ b/gpu/command_buffer/service/gpu_processor.cc
|
| @@ -52,12 +52,14 @@ GPUProcessor::~GPUProcessor() {
|
| Destroy();
|
| }
|
|
|
| -bool GPUProcessor::InitializeCommon(gfx::GLContext* context,
|
| - const gfx::Size& size,
|
| - const char* allowed_extensions,
|
| - const std::vector<int32>& attribs,
|
| - gles2::GLES2Decoder* parent_decoder,
|
| - uint32 parent_texture_id) {
|
| +bool GPUProcessor::InitializeCommon(
|
| + gfx::GLContext* context,
|
| + const gfx::Size& size,
|
| + const gles2::DisallowedExtensions& disallowed_extensions,
|
| + const char* allowed_extensions,
|
| + const std::vector<int32>& attribs,
|
| + gles2::GLES2Decoder* parent_decoder,
|
| + uint32 parent_texture_id) {
|
| DCHECK(context);
|
|
|
| if (!context->MakeCurrent())
|
| @@ -90,6 +92,7 @@ bool GPUProcessor::InitializeCommon(gfx::GLContext* context,
|
| // Initialize the decoder with either the view or pbuffer GLContext.
|
| if (!decoder_->Initialize(context,
|
| size,
|
| + disallowed_extensions,
|
| allowed_extensions,
|
| attribs,
|
| parent_decoder,
|
|
|