Android Java Surfaces can now be looked up via GpuSurfaceTracker

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.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ skipping 466 matching lines @@
         if (!surface.isValid())
             throw new RuntimeException("Attempting to register invalid Surface.");
         sViewSurfaceMap.put(surfaceId, surface);
     }
 
     @CalledByNative
     private static void unregisterViewSurface(int surfaceId) {
         sViewSurfaceMap.remove(surfaceId);
     }
 
+    @CalledByNative
+    private static Surface getViewSurface(int surfaceId) {
+        Surface surface = sViewSurfaceMap.get(surfaceId);
+        if (surface == null) {
+            Log.e(TAG, "Invalid surfaceId.");
+            return null;
+        }
+        if (!surface.isValid()) {
+            Log.e(TAG, "Requested surface is not valid.");
+            return null;
+        }
+        return surface;
+    }
+
     private static void registerSurfaceTextureSurface(
             int surfaceTextureId, int clientId, Surface surface) {
         Pair<Integer, Integer> key = new Pair<Integer, Integer>(surfaceTextureId, clientId);
         sSurfaceTextureSurfaceMap.put(key, surface);
     }
 
     private static void unregisterSurfaceTextureSurface(int surfaceTextureId, int clientId) {
         Pair<Integer, Integer> key = new Pair<Integer, Integer>(surfaceTextureId, clientId);
         Surface surface = sSurfaceTextureSurfaceMap.remove(key);
         if (surface == null) return;
@@ skipping 322 matching lines @@
                 nativeEstablishSurfacePeer(pid, surface, primaryID, secondaryID);
             }
 
             @Override
             public SurfaceWrapper getViewSurface(int surfaceId) {
                 // Do not allow a malicious renderer to get to our view surface.
                 if (callbackType != CALLBACK_FOR_GPU_PROCESS) {
                     Log.e(TAG, "Illegal callback for non-GPU process.");
                     return null;
                 }
-
-                Surface surface = sViewSurfaceMap.get(surfaceId);
+                Surface surface = ChildProcessLauncher.getViewSurface(surfaceId);
                 if (surface == null) {
-                    Log.e(TAG, "Invalid surfaceId.");
-                    return null;
-                }
-                if (!surface.isValid()) {
-                    Log.e(TAG, "Requested surface is not valid.");
                     return null;
                 }
                 return new SurfaceWrapper(surface);
             }
 
             @Override
             public void registerSurfaceTextureSurface(
                     int surfaceTextureId, int clientId, Surface surface) {
                 if (callbackType != CALLBACK_FOR_GPU_PROCESS) {
                     Log.e(TAG, "Illegal callback for non-GPU process.");
@@ skipping 96 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();
 }