Aura: Don't create GL context for CreateSharedSurfaceHandle()

content/browser/aura/gpu_process_transport_factory.cc

 // Copyright (c) 2013 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/browser/aura/gpu_process_transport_factory.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 270 matching lines @@
   if (per_compositor_data_.empty())
     gl_helper_.reset();
 }
 
 bool GpuProcessTransportFactory::DoesCreateTestContexts() { return false; }
 
 ui::ContextFactory* GpuProcessTransportFactory::AsContextFactory() {
   return this;
 }
 
-gfx::GLSurfaceHandle GpuProcessTransportFactory::CreateSharedSurfaceHandle() {
+gfx::GLSurfaceHandle GpuProcessTransportFactory::GetSharedSurfaceHandle() {
+  // TODO(sievers): crbug.com/329737
+  //                Creating the context here hurts startup performance.
+  //                Remove this once all tests are happy.
   scoped_refptr<cc::ContextProvider> provider =
       SharedMainThreadContextProvider();
-  if (!provider.get())
-    return gfx::GLSurfaceHandle();
-  ContextProviderCommandBuffer* provider_command_buffer =
-      static_cast<ContextProviderCommandBuffer*>(provider.get());
+  LOG_IF(ERROR, !provider.get())
+      << "Could not create shared context. CanUseBrowserCompositor() = "
+      << GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor();
+
   gfx::GLSurfaceHandle handle = gfx::GLSurfaceHandle(
       gfx::kNullPluginWindow, gfx::TEXTURE_TRANSPORT);
-  handle.parent_gpu_process_id = provider_command_buffer->GetGPUProcessID();
   handle.parent_client_id =
       BrowserGpuChannelHostFactory::instance()->GetGpuChannelId();
   return handle;
 }
 
-void GpuProcessTransportFactory::DestroySharedSurfaceHandle(
-    gfx::GLSurfaceHandle surface) {}
-
 scoped_refptr<ui::Texture> GpuProcessTransportFactory::CreateTransportClient(
     float device_scale_factor) {
   scoped_refptr<cc::ContextProvider> provider =
       SharedMainThreadContextProvider();
   if (!provider.get())
     return NULL;
   GLuint texture_id = 0;
   provider->ContextGL()->GenTextures(1, &texture_id);
   scoped_refptr<ImageTransportClientTexture> image(
       new ImageTransportClientTexture(
@@ skipping 162 matching lines @@
                     observer_list_,
                     OnLostResources());
 
   // Kill things that use the shared context before killing the shared context.
   lost_gl_helper.reset();
   lost_offscreen_compositor_contexts = NULL;
   lost_shared_main_thread_contexts  = NULL;
 }
 
 }  // namespace content