ppapi/native_client/src/trusted/plugin/plugin.cc - Issue 212103002: Check NaCl debug mask (not just flag) before choosing PNaCl debug URL.

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 212103002: Check NaCl debug mask (not just flag) before choosing PNaCl debug URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 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

« components/nacl/common/nacl_host_messages.h ('K') | « ppapi/c/private/ppb_nacl_private.h ('k') | ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c » ('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 060693443ecaf6d5aad7b6885fc1343cd23bb24d..8d74d08690f115335288ba3f9aedfe8362799ac8 100644

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

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

@@ -1153,7 +1153,8 @@ bool Plugin::SetManifestObject(const nacl::string& manifest_json,

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

bool nonsfi_mode_enabled =

PP_ToBool(nacl_interface_->IsNonSFIModeEnabled());

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

+ bool pnacl_debug = GetNaClInterface()->NaClDebugEnabledForURL(

+ manifest_base_url().c_str());

const char* sandbox_isa = nacl_interface_->GetSandboxArch();

nacl::scoped_ptr<JsonManifest> json_manifest(

new JsonManifest(url_util_,