gpu: Associate all GpuMemoryBuffers with unique IDs.

content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java

 // Copyright 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.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.graphics.SurfaceTexture;
 import android.os.RemoteException;
 import android.util.Log;
@@ skipping 527 matching lines @@
                     int surfaceTextureId, int clientId) {
                 if (callbackType != CALLBACK_FOR_GPU_PROCESS) {
                     Log.e(TAG, "Illegal callback for non-GPU process.");
                     return;
                 }
 
                 ChildProcessLauncher.unregisterSurfaceTextureSurface(surfaceTextureId, clientId);
             }
 
             @Override
-            public SurfaceWrapper getSurfaceTextureSurface(int surfaceTextureId, int clientId) {
+            public SurfaceWrapper getSurfaceTextureSurface(int surfaceTextureId) {
                 if (callbackType != CALLBACK_FOR_RENDERER_PROCESS) {
                     Log.e(TAG, "Illegal callback for non-renderer process.");
                     return null;
                 }
 
-                if (clientId != childProcessId) {
-                    Log.e(TAG, "Illegal secondaryId for renderer process.");
-                    return null;
-                }
-
-                return ChildProcessLauncher.getSurfaceTextureSurface(surfaceTextureId, clientId);
+                return ChildProcessLauncher.getSurfaceTextureSurface(surfaceTextureId,
+                        childProcessId);
             }
         };
     }
 
     static void logPidWarning(int pid, String message) {
         // This class is effectively a no-op in single process mode, so don't log warnings there.
         if (pid > 0 && !nativeIsSingleProcess()) {
             Log.w(TAG, message + ", pid=" + pid);
         }
     }
@@ skipping 30 matching lines @@
         }
 
         return true;
     }
 
     private static native void nativeOnChildProcessStarted(long clientContext, int pid);
     private static native void nativeEstablishSurfacePeer(
             int pid, Surface surface, int primaryID, int secondaryID);
     private static native boolean nativeIsSingleProcess();
 }