content: Out-of-process GPU service support for SurfaceTexture backed GpuMemoryBuffers.

content/browser/android/browser_surface_texture_manager.cc

Index: content/browser/android/browser_surface_texture_manager.cc
diff --git a/content/browser/android/browser_surface_texture_manager.cc b/content/browser/android/browser_surface_texture_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2df9d7f64b246e311a48949b91a22b7a4283fa6c
--- /dev/null
+++ b/content/browser/android/browser_surface_texture_manager.cc
@@ -0,0 +1,134 @@
+// 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/android/browser_surface_texture_manager.h"
+
+#include <android/native_window_jni.h>
+
+#include "base/android/jni_android.h"
+#include "content/browser/android/child_process_launcher_android.h"
+#include "content/browser/frame_host/render_frame_host_impl.h"
+#include "content/browser/media/android/browser_media_player_manager.h"
+#include "content/browser/media/media_web_contents_observer.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_process_host.h"
+#include "media/base/android/media_player_android.h"
+#include "ui/gl/android/scoped_java_surface.h"
+#include "ui/gl/android/surface_texture.h"
+
+namespace content {
+namespace {
+
+// Pass a java surface object to the MediaPlayerAndroid object
+// identified by render process handle, render frame ID and player ID.
+static void SetSurfacePeer(scoped_refptr<gfx::SurfaceTexture> surface_texture,
+                           base::ProcessHandle render_process_handle,
+                           int render_frame_id,
+                           int player_id) {
+  int render_process_id = 0;
+  RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
+  while (!it.IsAtEnd()) {
+    if (it.GetCurrentValue()->GetHandle() == render_process_handle) {
+      render_process_id = it.GetCurrentValue()->GetID();
+      break;
+    }
+    it.Advance();
+  }
+  if (!render_process_id) {
+    DVLOG(1) << "Cannot find render process for render_process_handle "
+             << render_process_handle;
+    return;
+  }
+
+  RenderFrameHostImpl* frame =
+      RenderFrameHostImpl::FromID(render_process_id, render_frame_id);
+  if (!frame) {
+    DVLOG(1) << "Cannot find frame for render_frame_id " << render_frame_id;
+    return;
+  }
+
+  RenderViewHostImpl* view =
+      static_cast<RenderViewHostImpl*>(frame->GetRenderViewHost());
+  BrowserMediaPlayerManager* player_manager =
+      view->media_web_contents_observer()->GetMediaPlayerManager(frame);
+  if (!player_manager) {
+    DVLOG(1) << "Cannot find the media player manager for frame " << frame;
+    return;
+  }
+
+  media::MediaPlayerAndroid* player = player_manager->GetPlayer(player_id);
+  if (!player) {
+    DVLOG(1) << "Cannot find media player for player_id " << player_id;
+    return;
+  }
+
+  if (player != player_manager->GetFullscreenPlayer()) {
+    gfx::ScopedJavaSurface scoped_surface(surface_texture);
+    player->SetVideoSurface(scoped_surface.Pass());
+  }
+}
+
+}  // namespace
+
+BrowserSurfaceTextureManager::BrowserSurfaceTextureManager() {
+  SurfaceTexturePeer::InitInstance(this);
+}
+
+BrowserSurfaceTextureManager::~BrowserSurfaceTextureManager() {
+  SurfaceTexturePeer::InitInstance(NULL);
+}
+
+void BrowserSurfaceTextureManager::RegisterSurfaceTexture(
+    int surface_texture_id,
+    int client_id,
+    gfx::SurfaceTexture* surface_texture) {
+  gfx::ScopedJavaSurface surface(surface_texture);

[no sievers, 2014/10/07 22:12:45]

Does the surface still work when you pass it to Java, since ~ScopedJavaSurface()
will call release() on it.
Wouldn't the assert for surface.isValid() in
ChildProcessLauncher.getSurfaceTextureSurface() fail?

You could add a leak() method to ScopedJavaSurface. (I wouldn't call it
release() since that makes it easy to confuse with Surface.release()).

[reveman, 2014/10/08 15:56:39]

Ah, I was too quick to change this without actually verifying that it worked. I
think it's easier and cleaner to handle this in java land so I changed things
around a bit in latest patch. The java API is now
create/destroySurfaceTextureSurface instead. PTAL.

+  content::RegisterSurfaceTextureSurface(
+      surface_texture_id, client_id, surface.j_surface().obj());
+}
+
+void BrowserSurfaceTextureManager::UnregisterSurfaceTexture(
+    int surface_texture_id,
+    int client_id) {
+  content::UnregisterSurfaceTextureSurface(surface_texture_id, client_id);
+}
+
+gfx::AcceleratedWidget BrowserSurfaceTextureManager::AcquireNativeWidget(
+    int surface_texture_id,
+    int client_id) {
+  gfx::ScopedJavaSurface surface(

[no sievers, 2014/10/07 22:12:45]

Similar problem here. I think it works the first time since you are creating the
native_window before the ref is released. But I think you would not be able to
call this method here a second time. Not sure if you need to support that, but
since you are still tracking the surfaces might as well.
I think here you can actually use:

gfx::ScopedJavaSurface surface(ScopedJavaSurface::AcquireExternalSurface(...

which will keep it from releasing it.

[reveman, 2014/10/08 15:56:39]

Nice catch. Should be fixed in latest patch. Including the child process case.

+      content::GetSurfaceTextureSurface(surface_texture_id, client_id));
+  if (surface.j_surface().is_null())
+    return NULL;
+
+  JNIEnv* env = base::android::AttachCurrentThread();
+  // Note: This ensures that any local references used by
+  // ANativeWindow_fromSurface are released immediately. This is needed as a
+  // workaround for https://code.google.com/p/android/issues/detail?id=68174
+  base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
+  ANativeWindow* native_window =
+      ANativeWindow_fromSurface(env, surface.j_surface().obj());
+
+  return native_window;
+}
+
+void BrowserSurfaceTextureManager::EstablishSurfaceTexturePeer(
+    base::ProcessHandle render_process_handle,
+    scoped_refptr<gfx::SurfaceTexture> surface_texture,
+    int render_frame_id,
+    int player_id) {
+  if (!surface_texture.get())
+    return;
+
+  BrowserThread::PostTask(BrowserThread::UI,
+                          FROM_HERE,
+                          base::Bind(&SetSurfacePeer,
+                                     surface_texture,
+                                     render_process_handle,
+                                     render_frame_id,
+                                     player_id));
+}
+
+}  // namespace content