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 65 matching lines @@
 #if defined(USE_AURA)
 #include "content/public/browser/context_factory.h"
 #include "ui/aura/env.h"
 #endif
 
 #if !defined(OS_IOS)
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #endif
 
 #if defined(OS_ANDROID)
+#include <android/native_window.h>
+#include <android/native_window_jni.h>
+
 #include "base/android/jni_android.h"
+#include "base/containers/scoped_ptr_hash_map.h"
+#include "base/memory/singleton.h"
+#include "base/synchronization/lock.h"
 #include "content/browser/android/browser_startup_controller.h"
 #include "content/browser/android/browser_surface_texture_manager.h"
 #include "content/browser/android/tracing_controller_android.h"
 #include "content/browser/screen_orientation/screen_orientation_delegate_android.h"
+#include "content/common/android/surface_texture_manager.h"
 #include "content/public/browser/screen_orientation_provider.h"
+#include "ui/gl/android/scoped_java_surface.h"
+#include "ui/gl/android/surface_texture.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/containers/scoped_ptr_hash_map.h"
+#include "base/mac/scoped_mach_port.h"
 #include "base/memory/memory_pressure_monitor_mac.h"
+#include "base/memory/singleton.h"
+#include "base/synchronization/lock.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/theme_helper_mac.h"
+#include "content/common/mac/io_surface_manager.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"
 #include "content/common/sandbox_win.h"
@@ skipping 36 matching lines @@
 #endif
 
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
 #endif
 
 namespace content {
 namespace {
 
+#if defined(OS_ANDROID)
+class InProcessSurfaceTextureManager : public SurfaceTextureManager {

[Daniele Castagna, 2015/06/09 14:45:07]

I still think these two classes should live somewhere else.

[reveman, 2015/06/09 17:48:14]

Done.

+ public:
+  static InProcessSurfaceTextureManager* GetInstance() {
+    return Singleton<
+        InProcessSurfaceTextureManager,
+        LeakySingletonTraits<InProcessSurfaceTextureManager>>::get();
+  }
+
+  // Overridden from SurfaceTextureManager:
+  void RegisterSurfaceTexture(int surface_texture_id,
+                              int client_id,
+                              gfx::SurfaceTexture* surface_texture) override {
+    base::AutoLock lock(lock_);
+    DCHECK(surface_textures_.find(surface_texture_id) ==

[Daniele Castagna, 2015/06/09 14:45:07]

nit: DCHECK(!bla.contains()).

[reveman, 2015/06/09 17:48:14]

Kept the existing DCHECK to be consistent with Browser*Manager implementations.

+           surface_textures_.end());
+    surface_textures_.set(
+        surface_texture_id,
+        make_scoped_ptr(new gfx::ScopedJavaSurface(surface_texture)));
+  }
+  void UnregisterSurfaceTexture(int surface_texture_id,
+                                int client_id) override {
+    base::AutoLock lock(lock_);
+    DCHECK(surface_textures_.find(surface_texture_id) !=

[Daniele Castagna, 2015/06/09 14:45:06]

nit: same as above.

[reveman, 2015/06/09 17:48:14]

ditto

+           surface_textures_.end());
+    surface_textures_.erase(surface_texture_id);
+  }
+  gfx::AcceleratedWidget AcquireNativeWidgetForSurfaceTexture(
+      int surface_texture_id) override {
+    base::AutoLock lock(lock_);
+    DCHECK(surface_textures_.find(surface_texture_id) !=
+           surface_textures_.end());
+    JNIEnv* env = base::android::AttachCurrentThread();
+    return ANativeWindow_fromSurface(
+        env, surface_textures_.get(surface_texture_id)->j_surface().obj());
+  }
+
+ private:
+  friend struct DefaultSingletonTraits<InProcessSurfaceTextureManager>;
+
+  using SurfaceTextureMap =
+      base::ScopedPtrHashMap<int, scoped_ptr<gfx::ScopedJavaSurface>>;
+  SurfaceTextureMap surface_textures_;
+  base::Lock lock_;
+};
+#endif
+
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+class InProcessIOSurfaceManager : public IOSurfaceManager {
+ public:
+  static InProcessIOSurfaceManager* GetInstance() {
+    return Singleton<InProcessIOSurfaceManager,
+                     LeakySingletonTraits<InProcessIOSurfaceManager>>::get();
+  }
+
+  // Overridden from IOSurfaceManager:
+  bool RegisterIOSurface(int io_surface_id,
+                         int client_id,
+                         IOSurfaceRef io_surface) override {
+    base::AutoLock lock(lock_);
+    DCHECK(io_surfaces_.find(io_surface_id) == io_surfaces_.end());
+    io_surfaces_.add(io_surface_id,
+                     make_scoped_ptr(new base::mac::ScopedMachSendRight(
+                         IOSurfaceCreateMachPort(io_surface))));
+    return true;
+  }
+  void UnregisterIOSurface(int io_surface_id, int client_id) override {
+    base::AutoLock lock(lock_);
+    DCHECK(io_surfaces_.find(io_surface_id) != io_surfaces_.end());
+    io_surfaces_.erase(io_surface_id);
+  }
+  IOSurfaceRef AcquireIOSurface(int io_surface_id) override {
+    base::AutoLock lock(lock_);
+    DCHECK(io_surfaces_.find(io_surface_id) != io_surfaces_.end());
+    return IOSurfaceLookupFromMachPort(io_surfaces_.get(io_surface_id)->get());
+  }
+
+ private:
+  friend struct DefaultSingletonTraits<InProcessIOSurfaceManager>;
+
+  using IOSurfaceMap =
+      base::ScopedPtrHashMap<int, scoped_ptr<base::mac::ScopedMachSendRight>>;
+  IOSurfaceMap io_surfaces_;
+  base::Lock lock_;
+};
+#endif
+
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 void SetupSandbox(const base::CommandLine& parsed_command_line) {
   TRACE_EVENT0("startup", "SetupSandbox");
   base::FilePath sandbox_binary;
 
   scoped_ptr<sandbox::SetuidSandboxHost> setuid_sandbox_host(
       sandbox::SetuidSandboxHost::Create());
 
   const bool want_setuid_sandbox =
       !parsed_command_line.HasSwitch(switches::kNoSandbox) &&
@@ skipping 410 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