ppapi/native_client/src/trusted/plugin/plugin.cc - Issue 181153002: Have PNaCl use debug pexe URL instead of stripped pexe w/ kEnableNaClDebug

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: ppapi/native_client/src/trusted/plugin/plugin.cc

Issue 181153002: Have PNaCl use debug pexe URL instead of stripped pexe w/ kEnableNaClDebug (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: nosandbox win Created 6 years, 10 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

« ppapi/native_client/src/trusted/plugin/json_manifest.cc ('K') | « ppapi/native_client/src/trusted/plugin/json_manifest.cc ('k') | ppapi/native_client/src/trusted/plugin/pnacl_options.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/native_client/src/trusted/plugin/plugin.cc

diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc

index 97669a8c07edf85c40706187bcea53874a4372da..d8763ff6e5cc1bac79035c9cc467bcce3158359d 100644

--- a/ppapi/native_client/src/trusted/plugin/plugin.cc

+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc

@@ -1134,10 +1134,12 @@ bool Plugin::SetManifestObject(const nacl::string& manifest_json,

// Determine whether lookups should use portable (i.e., pnacl versions)

// rather than platform-specific files.

bool is_pnacl = (mime_type() == kPnaclMIMEType);

+ bool pnacl_debug = GetNaClInterface()->NaClDebugStubEnabled();

nacl::scoped_ptr<JsonManifest> json_manifest(

new JsonManifest(url_util_,

manifest_base_url(),

- (is_pnacl ? kPortableISA : GetSandboxISA())));

+ (is_pnacl ? kPortableISA : GetSandboxISA()),

+ pnacl_debug));

if (!json_manifest->Init(manifest_json, error_info)) {

return false;

}