| 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 bd8af8fd4d59624514e81a72611857875d30c548..f41584ab8f90a78d919eb50836e677897096ad45 100644
|
| --- a/gpu/command_buffer/service/context_group.cc
|
| +++ b/gpu/command_buffer/service/context_group.cc
|
| @@ -35,7 +35,7 @@ ContextGroup::ContextGroup(
|
| const scoped_refptr<SubscriptionRefSet>& subscription_ref_set,
|
| const scoped_refptr<ValueStateMap>& pending_valuebuffer_state,
|
| bool bind_generates_resource)
|
| - : context_type_(kContextTypeUndefined),
|
| + : context_type_(CONTEXT_TYPE_UNDEFINED),
|
| mailbox_manager_(mailbox_manager),
|
| memory_tracker_(memory_tracker),
|
| shader_translator_cache_(shader_translator_cache),
|
| @@ -82,13 +82,13 @@ ContextGroup::ContextType ContextGroup::GetContextType(
|
| unsigned webgl_version) {
|
| switch (webgl_version) {
|
| case 0:
|
| - return kContextTypeOther;
|
| + return CONTEXT_TYPE_OTHER;
|
| case 1:
|
| - return kContextTypeWebGL1;
|
| + return CONTEXT_TYPE_WEBGL1;
|
| case 2:
|
| - return kContextTypeWebGL2;
|
| + return CONTEXT_TYPE_WEBGL2;
|
| default:
|
| - return kContextTypeUndefined;
|
| + return CONTEXT_TYPE_UNDEFINED;
|
| }
|
| }
|
|
|
| @@ -96,12 +96,12 @@ bool ContextGroup::Initialize(
|
| GLES2Decoder* decoder,
|
| ContextGroup::ContextType context_type,
|
| const DisallowedFeatures& disallowed_features) {
|
| - if (context_type == kContextTypeUndefined) {
|
| + if (context_type == CONTEXT_TYPE_UNDEFINED) {
|
| LOG(ERROR) << "ContextGroup::Initialize failed because of unknown "
|
| << "context type.";
|
| return false;
|
| }
|
| - if (context_type_ == kContextTypeUndefined) {
|
| + if (context_type_ == CONTEXT_TYPE_UNDEFINED) {
|
| context_type_ = context_type;
|
| } else if (context_type_ != context_type) {
|
| LOG(ERROR) << "ContextGroup::Initialize failed because the type of "
|
|
|