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

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

Index: content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
index cd5e675721c825b4cae382a39b2360d4509b1a43..5b6a94249b13ef4c0c218b4475aa9b923840e70f 100644
--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessService.java
@@ -319,14 +319,45 @@ public class ChildProcessService extends Service {
 
     @SuppressWarnings("unused")
     @CalledByNative
-    private Surface getSurfaceTextureSurface(int primaryId, int secondaryId) {
+    private void registerSurfaceTextureSurface(
+          int surfaceTextureId, int clientId, Surface surface) {
+        if (mCallback == null) {
+            Log.e(TAG, "No callback interface has been provided.");
+            return;
+        }
+
+        try {
+            mCallback.registerSurfaceTextureSurface(surfaceTextureId, clientId, surface);
+        } catch (RemoteException e) {
+            Log.e(TAG, "Unable to call registerSurfaceTextureSurface: " + e);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @CalledByNative
+    private void unregisterSurfaceTextureSurface(int surfaceTextureId, int clientId) {
+        if (mCallback == null) {
+            Log.e(TAG, "No callback interface has been provided.");
+            return;
+        }
+
+        try {
+            mCallback.unregisterSurfaceTextureSurface(surfaceTextureId, clientId);
+        } catch (RemoteException e) {
+            Log.e(TAG, "Unable to call unregisterSurfaceTextureSurface: " + e);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    @CalledByNative
+    private Surface getSurfaceTextureSurface(int surfaceTextureId, int clientId) {
         if (mCallback == null) {
             Log.e(TAG, "No callback interface has been provided.");
             return null;
         }
 
         try {
-            return mCallback.getSurfaceTextureSurface(primaryId, secondaryId).getSurface();
+            return mCallback.getSurfaceTextureSurface(surfaceTextureId, clientId).getSurface();
         } catch (RemoteException e) {
             Log.e(TAG, "Unable to call getSurfaceTextureSurface: " + e);
             return null;