DialogSurfaceManager implementation.

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/android/unguessable_token_android.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/posix/global_descriptors.h"
 #include "base/unguessable_token.h"
 #include "content/child/child_thread_impl.h"
 #include "content/public/common/content_descriptors.h"
+#include "gpu/ipc/common/android/dialog_surface_lookup.h"
 #include "gpu/ipc/common/android/scoped_surface_request_conduit.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 ChildProcessSurfaceManager : public gpu::SurfaceTexturePeer,
                                    public gpu::ScopedSurfaceRequestConduit,
-                                   public gpu::GpuSurfaceLookup {
+                                   public gpu::GpuSurfaceLookup,
+                                   public gpu::DialogSurfaceLookup {
  public:
   ChildProcessSurfaceManager() {}
   ~ChildProcessSurfaceManager() override {}
 
   // |service impl| is the instance of
   // org.chromium.content.app.ChildProcessServiceImpl.
   void SetServiceImpl(const base::android::JavaRef<jobject>& service_impl) {
     service_impl_.Reset(service_impl);
   }
 
@@ skipping 43 matching lines @@
   }
 
   // Overridden from GpuSurfaceLookup:
   gl::ScopedJavaSurface AcquireJavaSurface(int surface_id) override {
     JNIEnv* env = base::android::AttachCurrentThread();
     return gl::ScopedJavaSurface(
         content::Java_ChildProcessServiceImpl_getViewSurface(env, service_impl_,
                                                              surface_id));
   }
 
+  // Overridden from DialogSurfaceLookup:
+  base::android::ScopedJavaLocalRef<jobject> GetDialogSurfaceManager()
+      override {
+    JNIEnv* env = base::android::AttachCurrentThread();
+    return  // base::android::ScopedJavaLocalRef<jobject>(

[boliu, 2017/01/04 23:14:39]

commented out code

[liberato (no reviews please), 2017/01/11 22:17:55]

Done.

+        Java_ChildProcessServiceImpl_getDialogSurfaceManager(
+            env, service_impl_.obj());
+  }
+
  private:
   friend struct base::DefaultLazyInstanceTraits<ChildProcessSurfaceManager>;
   // The instance of org.chromium.content.app.ChildProcessServiceImpl.
   base::android::ScopedJavaGlobalRef<jobject> service_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessSurfaceManager);
 };
 
 static base::LazyInstance<ChildProcessSurfaceManager>::Leaky
     g_child_process_surface_manager = LAZY_INSTANCE_INITIALIZER;
 
 // Chrome actually uses the renderer code path for all of its child
 // processes such as renderers, plugins, etc.
 void InternalInitChildProcessImpl(JNIEnv* env,
                                   const JavaParamRef<jobject>& service_impl,
                                   jint cpu_count,
                                   jlong cpu_features) {
   // Set the CPU properties.
   android_setCpu(cpu_count, cpu_features);
 
   g_child_process_surface_manager.Get().SetServiceImpl(service_impl);
 
   gpu::SurfaceTexturePeer::InitInstance(
       g_child_process_surface_manager.Pointer());
   gpu::GpuSurfaceLookup::InitInstance(
       g_child_process_surface_manager.Pointer());
   gpu::ScopedSurfaceRequestConduit::SetInstance(
       g_child_process_surface_manager.Pointer());
+  gpu::DialogSurfaceLookup::InitInstance(
+      g_child_process_surface_manager.Pointer());
 
   base::android::MemoryPressureListenerAndroid::RegisterSystemCallback(env);
 }
 
 }  // namespace <anonymous>
 
 void RegisterGlobalFileDescriptor(JNIEnv* env,
                                   const JavaParamRef<jclass>& clazz,
                                   jint id,
                                   jint fd,
@@ skipping 19 matching lines @@
 
 bool RegisterChildProcessServiceImpl(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShutdownMainThread(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   ChildThreadImpl::ShutdownThread();
 }
 
 }  // namespace content