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..27d84c5506e54068051df45f06bdde22fbecc0dc 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,46 @@ public class ChildProcessService extends Service { |
@SuppressWarnings("unused") |
@CalledByNative |
- private Surface getSurfaceTextureSurface(int primaryId, int secondaryId) { |
+ private void registerSurfaceTexture( |
+ int surfaceTextureId, int clientId, Object surfaceTextureObject) { |
+ if (mCallback == null) { |
+ Log.e(TAG, "No callback interface has been provided."); |
+ return; |
+ } |
+ |
+ try { |
+ mCallback.registerSurfaceTextureSurface(surfaceTextureId, clientId, |
+ new Surface((SurfaceTexture) surfaceTextureObject)); |
+ } catch (RemoteException e) { |
+ Log.e(TAG, "Unable to call registerSurfaceTextureSurface: " + e); |
+ } |
+ } |
+ |
+ @SuppressWarnings("unused") |
+ @CalledByNative |
+ private void unregisterSurfaceTexture(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; |