content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java - Issue 685983005: gpu: Associate all GpuMemoryBuffers with unique IDs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java

Issue 685983005: gpu: Associate all GpuMemoryBuffers with unique IDs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: one more ozone build fix Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/android/java/src/org/chromium/content/app/ChildProcessService.java ('k') | content/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java b/content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java

index affbeb7e67d288760cd6412ec86920f1e362a4ec..c46e297c446912b98b627ac02ba47a8e6b0a1847 100644

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

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

@@ -545,18 +545,14 @@ public class ChildProcessLauncher {

}

@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);

}

};

}