| 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 a7eca384e42476a325ccb9d1e9d04475053a7fa1..a39c9b795a67cd2bb23d3ce0fa6fb85db6347db4 100644
|
| --- a/ppapi/native_client/src/trusted/plugin/service_runtime.h
|
| +++ b/ppapi/native_client/src/trusted/plugin/service_runtime.h
|
| @@ -27,6 +27,8 @@
|
| #include "ppapi/c/trusted/ppb_file_io_trusted.h"
|
| #include "ppapi/cpp/completion_callback.h"
|
|
|
| +struct NaClFileInfo;
|
| +
|
| namespace nacl {
|
| class DescWrapper;
|
| } // namespace
|
| @@ -63,15 +65,15 @@ struct PostMessageResource {
|
| struct OpenManifestEntryResource {
|
| public:
|
| OpenManifestEntryResource(const std::string& target_url,
|
| - int32_t* descp,
|
| + struct NaClFileInfo* finfo,
|
| ErrorInfo* infop,
|
| bool* op_complete)
|
| : url(target_url),
|
| - out_desc(descp),
|
| + file_info(finfo),
|
| error_info(infop),
|
| op_complete_ptr(op_complete) {}
|
| std::string url;
|
| - int32_t* out_desc;
|
| + struct NaClFileInfo *file_info;
|
| ErrorInfo* error_info;
|
| bool* op_complete_ptr;
|
| };
|
| @@ -152,7 +154,8 @@ class PluginReverseInterface: public nacl::ReverseInterface {
|
|
|
| virtual bool EnumerateManifestKeys(std::set<nacl::string>* out_keys);
|
|
|
| - virtual bool OpenManifestEntry(nacl::string url_key, int32_t* out_desc);
|
| + virtual bool OpenManifestEntry(nacl::string url_key,
|
| + struct NaClFileInfo *info);
|
|
|
| virtual bool CloseManifestEntry(int32_t desc);
|
|
|
|
|