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

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

Issue 418423002: Pepper: Stop using SRPC for irt_open_resource(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 3 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/nacl_irt/manifest_service.cc ('k') | ppapi/proxy/nacl_message_scanner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4787162ee74787d8fcf792ef2fe514dc86a7db4f..c750e393db58f10e18aa5489e0f1c3fd8c71ce6e 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.cc
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
@@ -105,6 +105,16 @@ void PluginReverseInterface::StartupInitializationComplete() {
// GetPOSIXFileDesc.
bool PluginReverseInterface::OpenManifestEntry(nacl::string url_key,
struct NaClFileInfo* info) {
+ // This method should only ever be called from the PNaCl translator, as the
+ // IRT is not available there.
+ // TODO(teravest): Remove support for OpenManifestEntry here once
+ // crbug.com/302078 is resolved.
+ if (service_runtime_->main_service_runtime()) {
+ NaClLog(LOG_ERROR,
+ "OpenManifestEntry should only be used by PNaCl translator.\n");
+ return false;
+ }
+
bool op_complete = false; // NB: mu_ and cv_ also controls access to this!
// The to_open object is owned by the weak ref callback. Because this function
// waits for the callback to finish, the to_open object will be deallocated on
« no previous file with comments | « ppapi/nacl_irt/manifest_service.cc ('k') | ppapi/proxy/nacl_message_scanner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698