components/html_viewer/setup.cc - Issue 1164483003: Allow startup with missing V8 snapshot file.

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: components/html_viewer/setup.cc

Issue 1164483003: Allow startup with missing V8 snapshot file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix misplaced ifdef for Windows Created 5 years, 6 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:

Index: components/html_viewer/setup.cc

diff --git a/components/html_viewer/setup.cc b/components/html_viewer/setup.cc

index cdbf7323fd2fb4b9e0e77ecde2a61599fdb6c160..76a66148044c9f7acbe0eb54c49cd1b65ce030ca 100644

--- a/components/html_viewer/setup.cc

+++ b/components/html_viewer/setup.cc

@@ -114,11 +114,12 @@ void Setup::InitIfNecessary(const gfx::Size& screen_size_in_pixels,

renderer_scheduler_ = scheduler::RendererScheduler::Create();

blink_platform_.reset(new BlinkPlatformImpl(app_, renderer_scheduler_.get()));

#if defined(V8_USE_EXTERNAL_STARTUP_DATA)

- CHECK(gin::V8Initializer::LoadV8SnapshotFromFD(

- resource_loader_.ReleaseFile(kResourceNativesBlob).TakePlatformFile(), 0u,

- 0u,

+ gin::V8Initializer::LoadV8SnapshotFromFD(

resource_loader_.ReleaseFile(kResourceSnapshotBlob).TakePlatformFile(),

- 0u, 0u));

+ 0u, 0u);

+ gin::V8Initializer::LoadV8NativesFromFD(

+ resource_loader_.ReleaseFile(kResourceNativesBlob).TakePlatformFile(), 0u,

+ 0u);

#endif

blink::initialize(blink_platform_.get());

base::i18n::InitializeICUWithFileDescriptor(