Add ScopedSurfaceRequestManager

content/app/android/child_process_service_impl.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/app/android/child_process_service_impl.h"
 
 #include <android/native_window_jni.h>
 #include <cpu-features.h>
 
 #include "base/android/jni_array.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/logging.h"
 #include "base/macros.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"
 #include "ipc/ipc_descriptors.h"
 #include "jni/ChildProcessServiceImpl_jni.h"
 #include "ui/gl/android/scoped_java_surface.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::JavaIntArrayToIntVector;
 using base::android::JavaParamRef;
 
 namespace content {
 
 namespace {
 
 // TODO(sievers): Use two different implementations of this depending on if
 // 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
   // org.chromium.content.app.ChildProcessServiceImpl.
   explicit SurfaceTextureManagerImpl(
       const base::android::JavaRef<jobject>& service_impl)
       : 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:
   void RegisterSurfaceTexture(int surface_texture_id,
                               int client_id,
                               gl::SurfaceTexture* surface_texture) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     Java_ChildProcessServiceImpl_createSurfaceTextureSurface(
         env, service_impl_, surface_texture_id, client_id,
         surface_texture->j_surface_texture());
@@ skipping 29 matching lines @@
       base::ProcessHandle pid,
       scoped_refptr<gl::SurfaceTexture> surface_texture,
       int primary_id,
       int secondary_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     content::Java_ChildProcessServiceImpl_establishSurfaceTexturePeer(
         env, service_impl_, pid, surface_texture->j_surface_texture(),
         primary_id, secondary_id);
   }
 
+  // Overriden from ScopedSurfaceRequestConduit:
+  void FulfillScopedSurfaceRequest(
+      uint64_t request_id,
+      gl::SurfaceTexture* surface_texture) override {
+    JNIEnv* env = base::android::AttachCurrentThread();
+    content::Java_ChildProcessServiceImpl_fulfillScopedSurfaceRequest(
+        env, service_impl_, request_id, surface_texture->j_surface_texture());
+  }
+
   // Overridden from GpuSurfaceLookup:
   gfx::AcceleratedWidget AcquireNativeWidget(int surface_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     gl::ScopedJavaSurface surface(
         content::Java_ChildProcessServiceImpl_getViewSurface(env, service_impl_,
                                                              surface_id));
 
     if (surface.j_surface().is_null())
       return NULL;
 
@@ skipping 64 matching lines @@
 
 bool RegisterChildProcessServiceImpl(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShutdownMainThread(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   ChildThreadImpl::ShutdownThread();
 }
 
 }  // namespace content