Add ScopedSurfaceRequestManager

content/app/android/child_process_service_impl.cc

Index: content/app/android/child_process_service_impl.cc
diff --git a/content/app/android/child_process_service_impl.cc b/content/app/android/child_process_service_impl.cc
index 99ae3f85c76e469ed2af026ac97c22fef3bfa2ce..b9f9f9c7422ee7f1f81e2a3c34ac7f6b9659d148 100644
--- a/content/app/android/child_process_service_impl.cc
+++ b/content/app/android/child_process_service_impl.cc
@@ -12,9 +12,11 @@
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/nonce.h"
 #include "base/posix/global_descriptors.h"
 #include "content/child/child_thread_impl.h"
 #include "content/public/common/content_descriptors.h"
+#include "gpu/ipc/common/android/scoped_surface_request_conduit.h"
 #include "gpu/ipc/common/android/surface_texture_manager.h"
 #include "gpu/ipc/common/android/surface_texture_peer.h"
 #include "gpu/ipc/common/gpu_surface_lookup.h"
@@ -35,6 +37,7 @@ namespace {
 // we're in a renderer or gpu process.
 class SurfaceTextureManagerImpl : public gpu::SurfaceTextureManager,
                                   public gpu::SurfaceTexturePeer,
+                                  public gpu::ScopedSurfaceRequestConduit,
                                   public gpu::GpuSurfaceLookup {
  public:
   // |service impl| is the instance of
@@ -44,10 +47,12 @@ class SurfaceTextureManagerImpl : public gpu::SurfaceTextureManager,
       : service_impl_(service_impl) {
     SurfaceTexturePeer::InitInstance(this);
     gpu::GpuSurfaceLookup::InitInstance(this);
+    gpu::ScopedSurfaceRequestConduit::SetInstance(this);
   }
   ~SurfaceTextureManagerImpl() override {
     SurfaceTexturePeer::InitInstance(NULL);
     gpu::GpuSurfaceLookup::InitInstance(NULL);
+    gpu::ScopedSurfaceRequestConduit::SetInstance(NULL);
   }
 
   // Overridden from SurfaceTextureManager:
@@ -97,6 +102,18 @@ class SurfaceTextureManagerImpl : public gpu::SurfaceTextureManager,
         primary_id, secondary_id);
   }
 
+  // Overriden from ScopedSurfaceRequestConduit:
+  void ForwardSurfaceTextureForSurfaceRequest(
+      base::Nonce request_token,
+      gl::SurfaceTexture* surface_texture) override {
+    JNIEnv* env = base::android::AttachCurrentThread();
+
+    content::
+        Java_ChildProcessServiceImpl_forwardSurfaceTextureForSurfaceRequest(
+            env, service_impl_, request_token.high(), request_token.low(),
+            surface_texture->j_surface_texture());
+  }
+
   // Overridden from GpuSurfaceLookup:
   gfx::AcceleratedWidget AcquireNativeWidget(int surface_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();