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

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

Issue 418423002: Pepper: Stop using SRPC for irt_open_resource(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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/service_runtime.h
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.h b/ppapi/native_client/src/trusted/plugin/service_runtime.h
index e3facc687583f9b3dabf130bc1043039b7053b2e..197585eb502d06769ac7602d6f7b77c7d14d3f85 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.h
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.h
@@ -68,23 +68,6 @@ struct SelLdrStartParams {
bool enable_crash_throttling;
};
-// Callback resources are essentially our continuation state.
-struct OpenManifestEntryResource {
- public:
- OpenManifestEntryResource(const std::string& target_url,
- struct NaClFileInfo* finfo,
- bool* op_complete)
- : url(target_url),
- file_info(finfo),
- op_complete_ptr(op_complete) {}
- ~OpenManifestEntryResource();
-
- std::string url;
- struct NaClFileInfo* file_info;
- PP_NaClFileInfo pp_file_info;
- bool* op_complete_ptr;
-};
-
// Do not invoke from the main thread, since the main methods will
// invoke CallOnMainThread and then wait on a condvar for the task to
// complete: if invoked from the main thread, the main method not
@@ -93,8 +76,7 @@ struct OpenManifestEntryResource {
// we'd get a deadlock.
class PluginReverseInterface: public nacl::ReverseInterface {
public:
- PluginReverseInterface(nacl::WeakRefAnchor* anchor,
- PP_Instance pp_instance,
+ PluginReverseInterface(PP_Instance pp_instance,
ServiceRuntime* service_runtime,
pp::CompletionCallback init_done_cb,
pp::CompletionCallback crash_cb);
@@ -120,18 +102,7 @@ class PluginReverseInterface: public nacl::ReverseInterface {
int64_t offset,
int64_t bytes_to_write);
- protected:
- virtual void OpenManifestEntry_MainThreadContinuation(
- OpenManifestEntryResource* p,
- int32_t err);
-
- virtual void StreamAsFile_MainThreadContinuation(
- OpenManifestEntryResource* p,
- int32_t result);
-
private:
- nacl::WeakRefAnchor* anchor_; // holds a ref
- // Should be used only in main thread in WeakRef-protected callbacks.
PP_Instance pp_instance_;
ServiceRuntime* service_runtime_;
NaClMutex mu_;
@@ -222,8 +193,6 @@ class ServiceRuntime {
nacl::ReverseService* reverse_service_;
nacl::scoped_ptr<SelLdrLauncherChrome> subprocess_;
- nacl::WeakRefAnchor* anchor_;
-
PluginReverseInterface* rev_interface_;
// Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_.

Powered by Google App Engine
This is Rietveld 408576698