content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java - Issue 2765453004: Moving FileDescriptorInfo from content/ to base/.

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/app/ChildProcessServiceImpl.java

Issue 2765453004: Moving FileDescriptorInfo from content/ to base/. (Closed)

Patch Set: Synced. Created 3 years, 9 months 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/BUILD.gn ('k') | content/public/android/java/src/org/chromium/content/browser/ChildProcessConnection.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java

diff --git a/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java b/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java

index b534242265adaec2f41040668aab7e6919359419..44762fbaf5bc0a89f646113f3a93c5e0383e41b9 100644

--- a/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java

+++ b/content/public/android/java/src/org/chromium/content/app/ChildProcessServiceImpl.java

@@ -31,9 +31,9 @@ import org.chromium.base.library_loader.LibraryLoader;

import org.chromium.base.library_loader.Linker;

import org.chromium.base.library_loader.ProcessInitException;

import org.chromium.base.process_launcher.ChildProcessCreationParams;

+import org.chromium.base.process_launcher.FileDescriptorInfo;

import org.chromium.content.browser.ChildProcessConstants;

import org.chromium.content.common.ContentSwitches;

-import org.chromium.content.common.FileDescriptorInfo;

import org.chromium.content.common.IChildProcessCallback;

import org.chromium.content.common.IChildProcessService;

import org.chromium.content.common.SurfaceWrapper;

@@ -268,10 +268,10 @@ public class ChildProcessServiceImpl {

long[] regionSizes = new long[mFdInfos.length];

for (int i = 0; i < mFdInfos.length; i++) {

FileDescriptorInfo fdInfo = mFdInfos[i];

- fileIds[i] = fdInfo.mId;

- fds[i] = fdInfo.mFd.detachFd();

- regionOffsets[i] = fdInfo.mOffset;

- regionSizes[i] = fdInfo.mSize;

+ fileIds[i] = fdInfo.id;

+ fds[i] = fdInfo.fd.detachFd();

+ regionOffsets[i] = fdInfo.offset;

+ regionSizes[i] = fdInfo.size;

}

nativeRegisterFileDescriptors(fileIds, fds, regionOffsets, regionSizes);

nativeInitChildProcessImpl(ChildProcessServiceImpl.this, mCpuCount,