Making callbacks in Android ChildProcessLauncher generic.

content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java

 // Copyright 2016 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.
 
 package org.chromium.content.app;
 
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.SurfaceTexture;
 import android.os.Binder;
@@ skipping 16 matching lines @@
 import org.chromium.base.annotations.MainDex;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.annotations.UsedByReflection;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.Linker;
 import org.chromium.base.library_loader.ProcessInitException;
 import org.chromium.base.process_launcher.ChildProcessCreationParams;
 import org.chromium.base.process_launcher.FileDescriptorInfo;
 import org.chromium.content.browser.ChildProcessConstants;
 import org.chromium.content.common.ContentSwitches;
-import org.chromium.content.common.IChildProcessCallback;
 import org.chromium.content.common.IChildProcessService;
+import org.chromium.content.common.IGpuProcessCallback;
 import org.chromium.content.common.SurfaceWrapper;
 
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * This class implements all of the functionality for {@link ChildProcessService} which owns an
  * object of {@link ChildProcessServiceImpl}.
  * It makes possible that WebAPK's ChildProcessService owns a ChildProcessServiceImpl object
  * and uses the same functionalities to create renderer process for WebAPKs when
  * "--enable-improved-a2hs" flag is turned on.
  */
 @JNINamespace("content")
 @SuppressWarnings("SynchronizeOnNonFinalField")
 @MainDex
 @UsedByReflection("WebApkSandboxedProcessService")
 public class ChildProcessServiceImpl {
     private static final String MAIN_THREAD_NAME = "ChildProcessMain";
     private static final String TAG = "ChildProcessService";
 
     // Lock that protects the following members.
     private final Object mBinderLock = new Object();
-    private IChildProcessCallback mCallback;
+    private IGpuProcessCallback mGpuCallback;
     // PID of the client of this service, set in bindToCaller().
     private int mBoundCallingPid;
 
     // This is the native "Main" thread for the renderer / utility process.
     private Thread mMainThread;
     // Parameters received via IPC, only accessed while holding the mMainThread monitor.
     private String[] mCommandLineParams;
     private int mCpuCount;
     private long mCpuFeatures;
     // File descriptors that should be registered natively.
@@ skipping 45 matching lines @@
                 } else if (mBoundCallingPid != callingPid) {
                     Log.e(TAG, "Service is already bound by pid %d, cannot bind for pid %d",
                             mBoundCallingPid, callingPid);
                     return false;
                 }
             }
             return true;
         }
 
         @Override
-        public int setupConnection(Bundle args, IChildProcessCallback callback) {
+        public int setupConnection(Bundle args, IBinder callback) {
             int callingPid = Binder.getCallingPid();
             synchronized (mBinderLock) {
                 if (mBoundCallingPid != callingPid) {
                     if (mBoundCallingPid == 0) {
                         Log.e(TAG, "Service has not been bound with bindToCaller()");
                     } else {
                         Log.e(TAG, "Client pid %d does not match the bound pid %d", callingPid,
                                 mBoundCallingPid);
                     }
                     return -1;
                 }
 
-                mCallback = callback;
+                mGpuCallback =
+                        callback != null ? IGpuProcessCallback.Stub.asInterface(callback) : null;
                 getServiceInfo(args);
                 return Process.myPid();
             }
         }
 
         @Override
         public void crashIntentionallyForTesting() {
             Process.killProcess(Process.myPid());
         }
 
@@ skipping 219 matching lines @@
                 sharedRelros = null;
             }
             mMainThread.notifyAll();
         }
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private void forwardSurfaceTextureForSurfaceRequest(
             UnguessableToken requestToken, SurfaceTexture surfaceTexture) {
-        if (mCallback == null) {
+        if (mGpuCallback == null) {
             Log.e(TAG, "No callback interface has been provided.");
             return;
         }
 
         Surface surface = new Surface(surfaceTexture);
 
         try {
-            mCallback.forwardSurfaceForSurfaceRequest(requestToken, surface);
+            mGpuCallback.forwardSurfaceForSurfaceRequest(requestToken, surface);
         } catch (RemoteException e) {
             Log.e(TAG, "Unable to call forwardSurfaceForSurfaceRequest: %s", e);
             return;
         } finally {
             surface.release();
         }
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private Surface getViewSurface(int surfaceId) {
-        if (mCallback == null) {
+        if (mGpuCallback == null) {
             Log.e(TAG, "No callback interface has been provided.");
             return null;
         }
 
         try {
-            SurfaceWrapper wrapper = mCallback.getViewSurface(surfaceId);
+            SurfaceWrapper wrapper = mGpuCallback.getViewSurface(surfaceId);
             return wrapper != null ? wrapper.getSurface() : null;
         } catch (RemoteException e) {
             Log.e(TAG, "Unable to call getViewSurface: %s", e);
             return null;
         }
     }
 
     /**
      * Helper for registering FileDescriptorInfo objects with GlobalFileDescriptors or
      * FileDescriptorStore.
@@ skipping 13 matching lines @@
     private static native void nativeInitChildProcessImpl(
             ChildProcessServiceImpl serviceImpl, int cpuCount, long cpuFeatures);
 
     /**
      * Force the child process to exit.
      */
     private static native void nativeExitChildProcess();
 
     private native void nativeShutdownMainThread();
 }