ppapi/native_client/src/trusted/plugin/service_runtime.cc - Issue 315753003: Pepper: Miscellaneous trusted plugin cleanup.

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/service_runtime.cc

Issue 315753003: Pepper: Miscellaneous trusted plugin cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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: ppapi/native_client/src/trusted/plugin/service_runtime.cc

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

index 6a7b9b52ffb641575b63ad3c861e48dc0507c50e..75ccb1c2a8b94c83863075a56d50ac69d31cdefd 100644

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

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

@@ -574,8 +574,13 @@ bool ServiceRuntime::StartModule() {

}

NaClLog(4, "ServiceRuntime::StartModule (load_status=%d)\n", load_status);

- if (main_service_runtime_)

- plugin_->ReportSelLdrLoadStatus(load_status);

+ if (main_service_runtime_) {

+ if (load_status < 0 || load_status > NACL_ERROR_CODE_MAX)

+ load_status = LOAD_STATUS_UNKNOWN;

+ GetNaClInterface()->ReportSelLdrStatus(plugin_->pp_instance(),

+ load_status,

+ NACL_ERROR_CODE_MAX);

+ }

if (LOAD_OK != load_status) {

if (main_service_runtime_) {