From cbd620bd6d0cb2aae80b5ce945de16b79c55d568 Mon Sep 17 00:00:00 2001 From: "miu@chromium.org" Date: Mon, 5 May 2014 22:21:14 +0000 Subject: Revert 268280 "Pepper: Move manifest logic to components/nacl." Caused build breakage because static initializer was added to ppb_nacl_private_impl.cc. Candidate (line 96): + const int32_t kPNaClManifestId = std::numeric_limits::max(); > Pepper: Move manifest logic to components/nacl. > > The goal of the trusted plugin refactor is to move as much code as possible out of ppapi/native_client/src/trusted/plugin. This change moves all the manifest parsing and lookup logic out of the trusted plugin at once; it's hard to move piecemeal. > > BUG=353592 > R=bbudge@chromium.org, mallinath@chromium.org > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=268250 > > Review URL: https://codereview.chromium.org/264943003 TBR=teravest@chromium.org Review URL: https://codereview.chromium.org/265393004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268295 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/c/private/ppb_nacl_private.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'ppapi/c') diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h index bc4a182..9ac540a 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 Mon May 5 10:57:38 2014. */ +/* From private/ppb_nacl_private.idl modified Sat May 3 04:07:13 2014. */ #ifndef PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ #define PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ @@ -407,22 +407,6 @@ struct PPB_NaCl_Private_1_0 { 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, - const char* sandbox_isa, - const char* manifest_data); - void (*DestroyManifest)(PP_Instance instance, int32_t manifest_id); - PP_Bool (*GetManifestProgramURL)(PP_Instance instance, - int32_t manifest_id, - struct PP_Var* full_url, - struct PP_PNaClOptions* pnacl_options, - PP_Bool* uses_nonsfi_mode); - PP_Bool (*ManifestResolveKey)(PP_Instance instance, - int32_t manifest_id, - const char* key, - struct PP_Var* full_url, - struct PP_PNaClOptions* pnacl_options); }; typedef struct PPB_NaCl_Private_1_0 PPB_NaCl_Private; -- cgit v1.1