Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1078)

Unified Diff: ppapi/native_client/src/trusted/plugin/plugin.h

Issue 332463003: Pepper: Remove LOAD_MODULE SRPC call in SFI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for jvoung and hidehiko 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:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/src/trusted/plugin/plugin.h
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.h b/ppapi/native_client/src/trusted/plugin/plugin.h
index 85ff49c967eeb5337d53553d9b6a09f879f621c9..89019cf278f5e3e3f3fe7fe8be00fdef9de16513 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.h
+++ b/ppapi/native_client/src/trusted/plugin/plugin.h
@@ -146,13 +146,12 @@ class Plugin : public pp::Instance {
// uma_interface_ normally.
void HistogramTimeSmall(const std::string& name, int64_t ms);
- // Load a nacl module from the file specified in file_info.
+ // Loads and starts a helper (e.g. llc, ld) NaCl module.
// Only to be used from a background (non-main) thread for the PNaCl
// translator. This will fully initialize the |subprocess| if the load was
// successful.
- bool LoadHelperNaClModule(PP_NaClFileInfo file_info,
- NaClSubprocess* subprocess,
- const SelLdrStartParams& params);
+ bool LoadHelperNaClModuleInternal(NaClSubprocess* subprocess,
+ const SelLdrStartParams& params);
// Start sel_ldr from the main thread, given the start params.
// |pp_error| is set by CallOnMainThread (should be PP_OK).
@@ -168,9 +167,7 @@ class Plugin : public pp::Instance {
ServiceRuntime* service_runtime);
// This is invoked on the main thread.
- void LoadNexeAndStart(int32_t pp_error,
- ServiceRuntime* service_runtime,
- PP_NaClFileInfo file_info);
+ void StartNexe(int32_t pp_error, ServiceRuntime* service_runtime);
// Callback used when getting the URL for the .nexe file. If the URL loading
// is successful, the file descriptor is opened and can be passed to sel_ldr

Powered by Google App Engine
This is Rietveld 408576698