| Index: gpu/command_buffer/service/context_group.cc
|
| diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc
|
| index b542d513550f8d35990952ce0ecc65f3b1f8b4eb..7538ab4da8d08a2149df4478532e7b097d6c1ca1 100644
|
| --- a/gpu/command_buffer/service/context_group.cc
|
| +++ b/gpu/command_buffer/service/context_group.cc
|
| @@ -7,6 +7,7 @@
|
| #include "gpu/command_buffer/common/id_allocator.h"
|
| #include "gpu/command_buffer/service/buffer_manager.h"
|
| #include "gpu/command_buffer/service/framebuffer_manager.h"
|
| +#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
|
| #include "gpu/command_buffer/service/program_manager.h"
|
| #include "gpu/command_buffer/service/renderbuffer_manager.h"
|
| #include "gpu/command_buffer/service/shader_manager.h"
|
| @@ -38,12 +39,13 @@ static void GetIntegerv(GLenum pname, uint32* var) {
|
| *var = value;
|
| }
|
|
|
| -bool ContextGroup::Initialize(const char* allowed_features) {
|
| +bool ContextGroup::Initialize(const DisallowedExtensions& extensions,
|
| + const char* allowed_features) {
|
| if (initialized_) {
|
| return true;
|
| }
|
|
|
| - if (!feature_info_.Initialize(allowed_features)) {
|
| + if (!feature_info_.Initialize(extensions, allowed_features)) {
|
| LOG(ERROR) << "ContextGroup::Initialize failed because FeatureInfo "
|
| << "initialization failed.";
|
| return false;
|
|
|