ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc - Issue 7741036: NaCl PPAPI Proxy: wrap up with crash detection. Clean-up handling code to skip remote shutdown ca...

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/shared/ppapi_proxy/browser_ppp.cc

Issue 7741036: NaCl PPAPI Proxy: wrap up with crash detection. Clean-up handling code to skip remote shutdown ca... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 4 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

« no previous file with comments | « ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.h ('k') | ppapi/native_client/src/shared/ppapi_proxy/plugin_ppp_messaging_rpc_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc

===================================================================

--- ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc (revision 98327)

+++ ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc (working copy)

@@ -125,16 +125,18 @@

CHECK(!is_nexe_alive_);

return; // The proxy has already been shut down.

}

- NaClSrpcError srpc_result =

- PppRpcClient::PPP_ShutdownModule(main_channel_);

- DebugPrintf("PPP_ShutdownModule: %s\n", NaClSrpcErrorString(srpc_result));

+ if (is_nexe_alive_) {

+ NaClSrpcError srpc_result =

+ PppRpcClient::PPP_ShutdownModule(main_channel_);

+ DebugPrintf("PPP_ShutdownModule: %s\n", NaClSrpcErrorString(srpc_result));

+ }

NaClThreadJoin(&upcall_thread_);

UnsetBrowserPppForInstance(plugin_->pp_instance());

UnsetModuleIdForSrpcChannel(main_channel_);

UnsetInstanceIdForSrpcChannel(main_channel_);

main_channel_ = NULL;

is_nexe_alive_ = false;

- DebugPrintf("PPP_Shutdown: done\n");

+ DebugPrintf("PPP_Shutdown: main_channel=NULL\n");

}

const void* BrowserPpp::GetPluginInterface(const char* interface_name) {