diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 01:22:19 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 01:22:19 +0000 |
| commit | 63c146773649fd120b69d3b5de979c9a23e5ce33 (patch) | |
| tree | eb484b19d6897da820af419493e7e53277dbe6e7 /ppapi/c | |
| parent | 7d660ee833d3eb8f7e225ed68d688873b4e9876a (diff) | |
| download | chromium_src-63c146773649fd120b69d3b5de979c9a23e5ce33.zip chromium_src-63c146773649fd120b69d3b5de979c9a23e5ce33.tar.gz chromium_src-63c146773649fd120b69d3b5de979c9a23e5ce33.tar.bz2 | |
Pepper: Simplify manifest download logic.
This cleans up some of the trusted plugin logic for requesting a NaCl manifest
and removes some interfaces in PPB_NaCl_Private, providing better
encapsulation.
This code is easier to follow after this change, as well, since more of the
logic is unified in ppb_nacl_private_impl.cc. This is part of a larger effort
to remove the trusted plugin.
BUG=239656
Review URL: https://codereview.chromium.org/288773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c')
| -rw-r--r-- | ppapi/c/private/ppb_nacl_private.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h index 881c554..34c125f 100644 --- a/ppapi/c/private/ppb_nacl_private.h +++ b/ppapi/c/private/ppb_nacl_private.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* From private/ppb_nacl_private.idl modified Tue May 13 11:00:06 2014. */ +/* From private/ppb_nacl_private.idl modified Wed May 14 11:49:42 2014. */ #ifndef PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ #define PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ @@ -384,14 +384,13 @@ struct PPB_NaCl_Private_1_0 { /* Returns the size of the nexe. */ int64_t (*GetNexeSize)(PP_Instance instance); /* Performs accounting for requesting the NaCl manifest at the given URL. */ - PP_Bool (*RequestNaClManifest)(PP_Instance instance, - const char* manifest_url, - PP_Bool* is_data_uri); + void (*RequestNaClManifest)(PP_Instance instance, + const char* manifest_url, + struct PP_Var* manifest_data, + struct PP_CompletionCallback callback); struct PP_Var (*GetManifestBaseURL)(PP_Instance instance); PP_Bool (*ResolvesRelativeToPluginBaseUrl)(PP_Instance instance, const char* url); - /* Returns the parsed contents of a data URL. */ - struct PP_Var (*ParseDataURL)(const char* data_url); /* Processes the NaCl manifest once it's been retrieved. * TODO(teravest): Move the rest of the supporting logic out of the trusted * plugin. @@ -400,12 +399,6 @@ struct PPB_NaCl_Private_1_0 { /* Returns the manifest url as passed as a plugin argument. */ struct PP_Var (*GetManifestURLArgument)(PP_Instance instance); PP_Bool (*DevInterfacesEnabled)(PP_Instance instance); - /* Downloads the manifest into the buffer |data|, invoking - * |callback| when finished. - * TODO(teravest): Merge data URL parsing into this. */ - void (*DownloadManifestToBuffer)(PP_Instance instance, - struct PP_Var* data, - struct PP_CompletionCallback callback); int32_t (*CreatePnaclManifest)(PP_Instance instance); int32_t (*CreateJsonManifest)(PP_Instance instance, const char* manifest_base_url, |