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

Unified Diff: components/nacl/renderer/plugin/service_runtime.h

Issue 1128943003: Move PNaCl process startup back to the main thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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: components/nacl/renderer/plugin/service_runtime.h
diff --git a/components/nacl/renderer/plugin/service_runtime.h b/components/nacl/renderer/plugin/service_runtime.h
index 8a4b67ce85b63c85ad259c7c80249a154d5664c3..b280e67c15f5ed85da2e54a6ba7fe4db8bcf14ed 100644
--- a/components/nacl/renderer/plugin/service_runtime.h
+++ b/components/nacl/renderer/plugin/service_runtime.h
@@ -56,27 +56,6 @@ class ServiceRuntime {
void StartSelLdr(const SelLdrStartParams& params,
pp::CompletionCallback callback);
- // If starting sel_ldr from a background thread, wait for sel_ldr to
- // actually start. Returns |false| if timed out waiting for the process
- // to start. Otherwise, returns |true| if StartSelLdr is complete
- // (either successfully or unsuccessfully).
- bool WaitForSelLdrStart();
-
- // Signal to waiting threads that StartSelLdr is complete (either
- // successfully or unsuccessfully).
- void SignalStartSelLdrDone();
-
- // If starting the nexe from a background thread, wait for the nexe to
- // actually start. Returns |true| is the nexe started successfully.
- bool WaitForNexeStart();
-
- // Returns |true| if WaitForSelLdrStart() timed out.
- bool SelLdrWaitTimedOut();
-
- // Signal to waiting threads that LoadNexeAndStart is complete (either
- // successfully or unsuccessfully).
- void SignalNexeStarted(bool ok);
-
// Establish an SrpcClient to the sel_ldr instance and start the nexe.
// This function must be called on the main thread.
// This function must only be called once.
@@ -104,14 +83,6 @@ class ServiceRuntime {
bool uses_nonsfi_mode_;
nacl::scoped_ptr<SelLdrLauncherChrome> subprocess_;
- // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_.
- NaClMutex mu_;
- NaClCondVar cond_;
- bool start_sel_ldr_done_;
- bool sel_ldr_wait_timed_out_;
- bool start_nexe_done_;
- bool nexe_started_ok_;
-
NaClHandle bootstrap_channel_;
};
« no previous file with comments | « components/nacl/renderer/plugin/pnacl_translate_thread.cc ('k') | components/nacl/renderer/plugin/service_runtime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698