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 b4b36e92565a72a23b995767ef164bcda3ed0ee5..04bff52c51f8f3bad599c03c1f4a39bdc8fda89f 100644 |
--- a/gpu/command_buffer/service/context_group.cc |
+++ b/gpu/command_buffer/service/context_group.cc |
@@ -36,7 +36,7 @@ ContextGroup::ContextGroup( |
const scoped_refptr<SubscriptionRefSet>& subscription_ref_set, |
const scoped_refptr<ValueStateMap>& pending_valuebuffer_state, |
bool bind_generates_resource) |
- : context_type_(CONTEXT_TYPE_UNDEFINED), |
+ : context_type_(CONTEXT_TYPE_OPENGLES2), |
mailbox_manager_(mailbox_manager), |
memory_tracker_(memory_tracker), |
shader_translator_cache_(shader_translator_cache), |
@@ -89,31 +89,11 @@ static void GetIntegerv(GLenum pname, uint32* var) { |
*var = value; |
} |
-// static |
-ContextGroup::ContextType ContextGroup::GetContextType( |
- unsigned webgl_version) { |
- switch (webgl_version) { |
- case 0: |
- return CONTEXT_TYPE_OTHER; |
- case 1: |
- return CONTEXT_TYPE_WEBGL1; |
- case 2: |
- return CONTEXT_TYPE_WEBGL2; |
- default: |
- return CONTEXT_TYPE_UNDEFINED; |
- } |
-} |
- |
bool ContextGroup::Initialize( |
GLES2Decoder* decoder, |
ContextGroup::ContextType context_type, |
const DisallowedFeatures& disallowed_features) { |
- if (context_type == CONTEXT_TYPE_UNDEFINED) { |
- LOG(ERROR) << "ContextGroup::Initialize failed because of unknown " |
- << "context type."; |
- return false; |
- } |
- if (context_type_ == CONTEXT_TYPE_UNDEFINED) { |
+ if (!HaveContexts()) { |
context_type_ = context_type; |
} else if (context_type_ != context_type) { |
LOG(ERROR) << "ContextGroup::Initialize failed because the type of " |