[CLOSED] Big patch.

content/browser/renderer_host/image_transport_factory.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/browser/renderer_host/image_transport_factory.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "cc/output_surface.h"
 #include "cc/output_surface_client.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
+#include "content/browser/renderer_host/software_output_device.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/common/webkitplatformsupport_impl.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/ipc/command_buffer_proxy.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_setup.h"
+#include "ui/compositor/compositor_switches.h"
 #include "ui/compositor/test_web_graphics_context_3d.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_WIN)
 #include "ui/surface/accelerated_surface_win.h"
 #endif
 
 namespace content {
 namespace {
@@ skipping 616 matching lines @@
   // Note: previous line destroyed this. Don't access members from now on.
 }
 
 WebKit::WebGraphicsContext3D* CreateTestContext() {
   ui::TestWebGraphicsContext3D* test_context =
       new ui::TestWebGraphicsContext3D();
   test_context->Initialize();
   return test_context;
 }
 
+class SoftwareTransportFactory : public DefaultTransportFactory {
+ public:
+  cc::OutputSurface* CreateOutputSurface(ui::Compositor* compositor) {
+    scoped_ptr<SoftwareOutputDevice> software_device(
+        new SoftwareOutputDevice(compositor));
+    return new cc::OutputSurface(
+        software_device.PassAs<cc::SoftwareOutputDevice>());
+  }
+};
+
 }  // anonymous namespace
 
 // static
 void ImageTransportFactory::Initialize() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kTestCompositor)) {
     ui::SetupTestCompositor();
   }
-  if (ui::IsTestCompositorEnabled())
+  if (ui::IsTestCompositorEnabled()) {
     g_factory = new DefaultTransportFactory();
-  else
-    g_factory = new GpuProcessTransportFactory();
+  } else if (command_line->HasSwitch(switches::kUIEnableSoftwareCompositing)) {
+    g_factory = new SoftwareTransportFactory;
+  } else {
+    g_factory = new GpuProcessTransportFactory;
+  }
   ui::ContextFactory::SetInstance(g_factory->AsContextFactory());
 }
 
 // static
 void ImageTransportFactory::Terminate() {
   ui::ContextFactory::SetInstance(NULL);
   delete g_factory;
   g_factory = NULL;
 }
 
 // static
 ImageTransportFactory* ImageTransportFactory::GetInstance() {
   return g_factory;
 }
 
 }  // namespace content