Setup GPU process host-output surface mapping with surfaces.

content/browser/compositor/gpu_process_transport_factory.cc

 // Copyright 2014 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/compositor/gpu_process_transport_factory.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 142 matching lines @@
   scoped_refptr<ContextProviderCommandBuffer> context_provider;
 
   if (!create_software_renderer) {
     context_provider = ContextProviderCommandBuffer::Create(
         GpuProcessTransportFactory::CreateContextCommon(data->surface_id),
         "Compositor");
   }
 
   UMA_HISTOGRAM_BOOLEAN("Aura.CreatedGpuBrowserCompositor", !!context_provider);
 
+  if (context_provider) {
+    scoped_refptr<base::SingleThreadTaskRunner> compositor_thread_task_runner =
+        GetCompositorMessageLoop();
+    if (!compositor_thread_task_runner.get())
+      compositor_thread_task_runner = base::MessageLoopProxy::current();
+
+    // Here we know the GpuProcessHost has been set up, because we created a
+    // context.
+    output_surface_proxy_->ConnectToGpuProcessHost(
+        compositor_thread_task_runner.get());
+  }
+
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseSurfaces)) {
     // This gets a bit confusing. Here we have a ContextProvider configured to
     // render directly to this widget. We need to make an OnscreenDisplayClient
     // associated with this context, then return a SurfaceDisplayOutputSurface
     // set up to draw to the display's surface.
     cc::SurfaceManager* manager = surface_manager_.get();
     scoped_ptr<cc::OutputSurface> software_surface;
     if (!context_provider) {
       software_surface =
@@ skipping 33 matching lines @@
     scoped_ptr<SoftwareBrowserCompositorOutputSurface> surface(
         new SoftwareBrowserCompositorOutputSurface(
             output_surface_proxy_,
             CreateSoftwareOutputDevice(compositor),
             per_compositor_data_[compositor]->surface_id,
             &output_surface_map_,
             compositor->vsync_manager()));
     return surface.PassAs<cc::OutputSurface>();
   }
 
-  scoped_refptr<base::SingleThreadTaskRunner> compositor_thread_task_runner =
-      GetCompositorMessageLoop();
-  if (!compositor_thread_task_runner.get())
-    compositor_thread_task_runner = base::MessageLoopProxy::current();
-
-  // Here we know the GpuProcessHost has been set up, because we created a
-  // context.
-  output_surface_proxy_->ConnectToGpuProcessHost(
-      compositor_thread_task_runner.get());
-
   scoped_ptr<BrowserCompositorOutputSurface> surface(
       new GpuBrowserCompositorOutputSurface(
           context_provider,
           per_compositor_data_[compositor]->surface_id,
           &output_surface_map_,
           compositor->vsync_manager(),
           CreateOverlayCandidateValidator(compositor->widget())));
   if (data->reflector.get())
     data->reflector->ReattachToOutputSurfaceFromMainThread(surface.get());
 
@@ skipping 205 matching lines @@
   FOR_EACH_OBSERVER(ImageTransportFactoryObserver,
                     observer_list_,
                     OnLostResources());
 
   // Kill things that use the shared context before killing the shared context.
   lost_gl_helper.reset();
   lost_shared_main_thread_contexts  = NULL;
 }
 
 }  // namespace content