Index: content/common/gpu/gpu_command_buffer_stub.cc |
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc |
index 0fb6c6e69baaa14e1cadb87cf16f57218b16cce8..3f0ae69db66e9af680a994969e4fa1b0d33da0ef 100644 |
--- a/content/common/gpu/gpu_command_buffer_stub.cc |
+++ b/content/common/gpu/gpu_command_buffer_stub.cc |
@@ -403,8 +403,10 @@ void GpuCommandBufferStub::OnInitialize( |
} |
scoped_refptr<gfx::GLContext> context; |
- if (CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kEnableVirtualGLContexts) && channel_->share_group()) { |
+ if ((context_group_->feature_info()->feature_flags().enable_virtual_context || |
+ CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kEnableVirtualGLContexts)) && |
+ channel_->share_group()) { |
context = channel_->share_group()->GetSharedContext(); |
if (!context) { |
context = gfx::GLContext::CreateGLContext( |