FeatureInfo: Remove allowed_extensions and init workarounds early

content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 
 #include "third_party/khronos/GLES2/gl2.h"
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 287 matching lines @@
 
   command_buffer_size_ = command_buffer_size;
   start_transfer_buffer_size_ = start_transfer_buffer_size;
   min_transfer_buffer_size_ = min_transfer_buffer_size;
   max_transfer_buffer_size_ = max_transfer_buffer_size;
   mapped_memory_limit_ = mapped_memory_limit;
 
   return true;
 }
 
-bool WebGraphicsContext3DCommandBufferImpl::MaybeInitializeGL(
-    const char* allowed_extensions) {
+bool WebGraphicsContext3DCommandBufferImpl::MaybeInitializeGL() {
   if (initialized_)
     return true;
 
   if (initialize_failed_)
     return false;
 
   TRACE_EVENT0("gpu", "WebGfxCtx3DCmdBfrImpl::MaybeInitializeGL");
 
-  const char* preferred_extensions = "*";
-
-  if (!CreateContext(surface_id_ != 0,
-                     allowed_extensions ?
-                         allowed_extensions : preferred_extensions)) {
+  if (!CreateContext(surface_id_ != 0)) {
     Destroy();
     initialize_failed_ = true;
     return false;
   }
 
   // TODO(twiz):  This code is too fragile in that it assumes that only WebGL
   // contexts will request noExtensions.
   if (gl_ && attributes_.noExtensions)
     gl_->EnableFeatureCHROMIUM("webgl_enable_glsl_webgl_validation");
 
@@ skipping 32 matching lines @@
     attributes_.stencil = pvalues[2] > 0;
     attributes_.antialias = pvalues[3] > 0;
   }
 
   visible_ = true;
   initialized_ = true;
   return true;
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::InitializeCommandBuffer(
-    bool onscreen,
-    const char* allowed_extensions) {
+    bool onscreen) {
   if (!host_.get())
     return false;
   // We need to lock g_all_shared_contexts to ensure that the context we picked
   // for our share group isn't deleted.
   // (There's also a lock in our destructor.)
   base::AutoLock lock(g_all_shared_contexts_lock.Get());
   CommandBufferProxyImpl* share_group = NULL;
   if (attributes_.shareResources) {
     WebGraphicsContext3DCommandBufferImpl* share_group_context =
         g_all_shared_contexts.Pointer()->empty() ?
@@ skipping 13 matching lines @@
   attribs.push_back(attributes_.antialias ? 4 : 0);
   attribs.push_back(SAMPLE_BUFFERS);
   attribs.push_back(attributes_.antialias ? 1 : 0);
   attribs.push_back(NONE);
 
   // Create a proxy to a command buffer in the GPU process.
   if (onscreen) {
     command_buffer_.reset(host_->CreateViewCommandBuffer(
         surface_id_,
         share_group,
-        allowed_extensions,
         attribs,
         active_url_,
         gpu_preference_));
   } else {
     command_buffer_.reset(host_->CreateOffscreenCommandBuffer(
         gfx::Size(1, 1),
         share_group,
-        allowed_extensions,
         attribs,
         active_url_,
         gpu_preference_));
   }
 
   if (!command_buffer_)
     return false;
 
   // Initialize the command buffer.
   return command_buffer_->Initialize();
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::CreateContext(
-    bool onscreen,
-    const char* allowed_extensions) {
-
+    bool onscreen) {
   // Ensure the gles2 library is initialized first in a thread safe way.
   g_gles2_initializer.Get();
 
   if (!command_buffer_ &&
-      !InitializeCommandBuffer(onscreen,
-                               allowed_extensions)) {
+      !InitializeCommandBuffer(onscreen)) {
     return false;
   }
 
   // Create the GLES2 helper, which writes the command buffer protocol.
   gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer_.get()));
   if (!gles2_helper_->Initialize(command_buffer_size_))
     return false;
 
   if (attributes_.noAutomaticFlushes)
     gles2_helper_->SetAutomaticFlushes(false);
@@ skipping 41 matching lines @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableGpuClientTracing)) {
     trace_gl_.reset(new gpu::gles2::GLES2TraceImplementation(gl_));
     gl_ = trace_gl_.get();
   }
 
   return true;
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::makeContextCurrent() {
-  if (!MaybeInitializeGL(NULL))
+  if (!MaybeInitializeGL())
     return false;
   gles2::SetGLContext(gl_);
   if (command_buffer_->GetLastError() != gpu::error::kNoError)
     return false;
 
   return true;
 }
 
 int WebGraphicsContext3DCommandBufferImpl::width() {
   return cached_width_;
@@ skipping 1078 matching lines @@
 
 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(
     const std::string& message, int id) {
   if (error_message_callback_) {
     WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str());
     error_message_callback_->onErrorMessage(str, id);
   }
 }
 
 }  // namespace content