chrome/browser/chrome_content_browser_client.cc - Issue 1156873002: Load v8 snapshots directly from APK (and store them uncompressed)

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: chrome/browser/chrome_content_browser_client.cc

Issue 1156873002: Load v8 snapshots directly from APK (and store them uncompressed) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v8initializer

Patch Set: fix webview, content shell, chromecast Created 5 years, 7 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 | « chrome/android/java_staging/src/org/chromium/chrome/browser/ChromeMobileApplication.java ('k') | chromecast/browser/cast_content_browser_client.cc » ('j') | content/app/content_main_runner.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index e07ea7aa1525c34b4ffab0b1a833072daa79498a..5cd98f88c59abc93e8eb603efe8d377f1c8a3180 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -2224,7 +2224,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(

const base::CommandLine& command_line,

int child_process_id,

FileDescriptorInfo* mappings) {

-#if defined(V8_USE_EXTERNAL_STARTUP_DATA)

+#if defined(V8_USE_EXTERNAL_STARTUP_DATA) && !defined(OS_ANDROID)

if (v8_natives_fd_.get() == -1 || v8_snapshot_fd_.get() == -1) {

int v8_natives_fd = -1;

int v8_snapshot_fd = -1;

@@ -2237,7 +2237,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(

DCHECK(v8_natives_fd_.get() != -1 && v8_snapshot_fd_.get() != -1);

mappings->Share(kV8NativesDataDescriptor, v8_natives_fd_.get());

mappings->Share(kV8SnapshotDataDescriptor, v8_snapshot_fd_.get());

-#endif // V8_USE_EXTERNAL_STARTUP_DATA

+#endif // V8_USE_EXTERNAL_STARTUP_DATA && !defined(OS_ANDROID)

#if defined(OS_ANDROID)

base::FilePath data_path;