Re-land: content: Single process support for native GpuMemoryBuffers.

content/browser/browser_main_loop.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/browser_main_loop.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 68 matching lines @@
 #endif
 
 #if !defined(OS_IOS)
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "content/browser/android/browser_startup_controller.h"
 #include "content/browser/android/browser_surface_texture_manager.h"
+#include "content/browser/android/in_process_surface_texture_manager.h"
 #include "content/browser/android/tracing_controller_android.h"
 #include "content/browser/screen_orientation/screen_orientation_delegate_android.h"
 #include "content/public/browser/screen_orientation_provider.h"
 #include "ui/gl/gl_surface.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "media/base/mac/avfoundation_glue.h"
 #endif
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/memory/memory_pressure_monitor_mac.h"
 #include "content/browser/bootstrap_sandbox_mac.h"
 #include "content/browser/browser_io_surface_manager_mac.h"
 #include "content/browser/cocoa/system_hotkey_helper_mac.h"
 #include "content/browser/compositor/browser_compositor_view_mac.h"
+#include "content/browser/in_process_io_surface_manager_mac.h"
 #include "content/browser/theme_helper_mac.h"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
 
 #include "base/memory/memory_pressure_monitor_win.h"
 #include "content/browser/system_message_window_win.h"
@@ skipping 467 matching lines @@
   // MessagePumpForUI::Start() as it will crash the browser.
   if (is_tracing_startup_) {
     TRACE_EVENT0("startup", "BrowserMainLoop::InitStartupTracing");
     InitStartupTracing(parsed_command_line_);
   }
 #endif  // !defined(OS_IOS)
 
 #if defined(OS_ANDROID)
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager");
-    SurfaceTextureManager::SetInstance(new BrowserSurfaceTextureManager);
+    if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
+      SurfaceTextureManager::SetInstance(
+          InProcessSurfaceTextureManager::GetInstance());
+    } else {
+      SurfaceTextureManager::SetInstance(
+          BrowserSurfaceTextureManager::GetInstance());
+    }
   }
 
   if (!parsed_command_line_.HasSwitch(
       switches::kDisableScreenOrientationLock)) {
     TRACE_EVENT0("startup",
                  "BrowserMainLoop::Subsystem:ScreenOrientationProvider");
     screen_orientation_delegate_.reset(
         new ScreenOrientationDelegateAndroid());
     ScreenOrientationProvider::SetDelegate(screen_orientation_delegate_.get());
   }
 #endif
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:IOSurfaceManager");
-    IOSurfaceManager::SetInstance(BrowserIOSurfaceManager::GetInstance());
+    if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
+      IOSurfaceManager::SetInstance(InProcessIOSurfaceManager::GetInstance());
+    } else {
+      IOSurfaceManager::SetInstance(BrowserIOSurfaceManager::GetInstance());
+    }
   }
 #endif
 
   if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver");
     memory_observer_.reset(new MemoryObserver());
     base::MessageLoop::current()->AddTaskObserver(memory_observer_.get());
   }
 
   if (parsed_command_line_.HasSwitch(
@@ skipping 749 matching lines @@
   DCHECK(is_tracing_startup_);
 
   is_tracing_startup_ = false;
   TracingController::GetInstance()->DisableRecording(
       TracingController::CreateFileSink(
           startup_trace_file_,
           base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
 }
 
 }  // namespace content