components/nacl/renderer/ppb_nacl_private_impl.cc - Issue 263683002: Set file tokens for NaCl main nexe if available to enable validation caching.

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/nacl/renderer/ppb_nacl_private_impl.cc

Issue 263683002: Set file tokens for NaCl main nexe if available to enable validation caching. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clear tokens too Created 6 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

« chrome/test/data/nacl/nacl_test_data.gyp ('K') | « components/nacl/browser/nacl_browser.cc ('k') | ppapi/api/private/ppb_nacl_private.idl » ('j') | ppapi/native_client/src/trusted/plugin/plugin.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/nacl/renderer/ppb_nacl_private_impl.cc

diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc

index 3f5685df07678b96d4082be323c11bdb8c509f0e..9a8c958fd6c8eae2da23c286efcce4ba3708d6c4 100644

--- a/components/nacl/renderer/ppb_nacl_private_impl.cc

+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc

@@ -1319,6 +1319,8 @@ void DownloadNexeCompletion(const DownloadNexeRequest& request,

void DownloadNexe(PP_Instance instance,

const char* url,

PP_FileHandle* out_handle,

+ uint64_t* file_token_lo,

+ uint64_t* file_token_hi,

PP_CompletionCallback callback) {

CHECK(url);

CHECK(out_handle);

@@ -1329,12 +1331,10 @@ void DownloadNexe(PP_Instance instance,

request.start_time = base::Time::Now();

// Try the fast path for retrieving the file first.

- uint64_t file_token_lo = 0;

- uint64_t file_token_hi = 0;

PP_FileHandle file_handle = OpenNaClExecutable(instance,

url,

- &file_token_lo,

- &file_token_hi);

+ file_token_lo,

+ file_token_hi);

if (file_handle != PP_kInvalidFileHandle) {

DownloadNexeCompletion(request,

file_handle,