| 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 2e1c7799bb6dd8e0a6d4abccf8265142cacbff7c..4d7047bd63f4568d96e4e6d26ec4bb93713bd061 100644
|
| --- a/ppapi/native_client/src/trusted/plugin/plugin.h
|
| +++ b/ppapi/native_client/src/trusted/plugin/plugin.h
|
| @@ -111,7 +111,7 @@ class Plugin : public pp::Instance {
|
| // Returns NULL or the NaClSubprocess of the new helper NaCl module.
|
| NaClSubprocess* LoadHelperNaClModule(const nacl::string& helper_url,
|
| nacl::DescWrapper* wrapper,
|
| - const Manifest* manifest,
|
| + int32_t manifest_id,
|
| ErrorInfo* error_info);
|
|
|
| enum LengthComputable {
|
| @@ -164,8 +164,6 @@ class Plugin : public pp::Instance {
|
| // document to request the URL using CORS even if this function returns false.
|
| bool DocumentCanRequest(const std::string& url);
|
|
|
| - Manifest const* manifest() const { return manifest_.get(); }
|
| -
|
| // set_exit_status may be called off the main thread.
|
| void set_exit_status(int exit_status);
|
|
|
| @@ -206,7 +204,7 @@ class Plugin : public pp::Instance {
|
| // This will fully initialize the |subprocess| if the load was successful.
|
| bool LoadNaClModuleFromBackgroundThread(nacl::DescWrapper* wrapper,
|
| NaClSubprocess* subprocess,
|
| - const Manifest* manifest,
|
| + int32_t manifest_id,
|
| const SelLdrStartParams& params);
|
|
|
| // Start sel_ldr from the main thread, given the start params.
|
| @@ -304,8 +302,7 @@ class Plugin : public pp::Instance {
|
|
|
| nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_;
|
|
|
| - // The manifest dictionary. Used for looking up resources to be loaded.
|
| - nacl::scoped_ptr<Manifest> manifest_;
|
| + int32_t manifest_id_;
|
|
|
| // Keep track of the FileDownloaders created to fetch urls.
|
| std::set<FileDownloader*> url_downloaders_;
|
|
|