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

Side by Side Diff: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

Issue 193313002: Pepper: Move GetSandboxISA() to PPB_NaCl_Private. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nacl_interface threading fix Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. 3 * found in the LICENSE file.
4 */ 4 */
5 5
6 /* NOTE: this is auto-generated from IDL */ 6 /* NOTE: this is auto-generated from IDL */
7 #include "ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.h" 7 #include "ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.h"
8 8
9 #include "ppapi/c/ppb.h" 9 #include "ppapi/c/ppb.h"
10 #include "ppapi/c/dev/ppb_alarms_dev.h" 10 #include "ppapi/c/dev/ppb_alarms_dev.h"
(...skipping 3158 matching lines...) Expand 10 before | Expand all | Expand 10 after
3169 static void Pnacl_M25_PPB_NaCl_Private_InstanceDestroyed(PP_Instance instance) { 3169 static void Pnacl_M25_PPB_NaCl_Private_InstanceDestroyed(PP_Instance instance) {
3170 const struct PPB_NaCl_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_NaCl_Private_ 1_0.real_iface; 3170 const struct PPB_NaCl_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_NaCl_Private_ 1_0.real_iface;
3171 iface->InstanceDestroyed(instance); 3171 iface->InstanceDestroyed(instance);
3172 } 3172 }
3173 3173
3174 static PP_Bool Pnacl_M25_PPB_NaCl_Private_NaClDebugStubEnabled(void) { 3174 static PP_Bool Pnacl_M25_PPB_NaCl_Private_NaClDebugStubEnabled(void) {
3175 const struct PPB_NaCl_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_NaCl_Private_ 1_0.real_iface; 3175 const struct PPB_NaCl_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_NaCl_Private_ 1_0.real_iface;
3176 return iface->NaClDebugStubEnabled(); 3176 return iface->NaClDebugStubEnabled();
3177 } 3177 }
3178 3178
3179 static const char* Pnacl_M25_PPB_NaCl_Private_GetSandboxArch(void) {
3180 const struct PPB_NaCl_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_NaCl_Private_ 1_0.real_iface;
3181 return iface->GetSandboxArch();
3182 }
3183
3179 /* End wrapper methods for PPB_NaCl_Private_1_0 */ 3184 /* End wrapper methods for PPB_NaCl_Private_1_0 */
3180 3185
3181 /* Begin wrapper methods for PPB_NetAddress_Private_0_1 */ 3186 /* Begin wrapper methods for PPB_NetAddress_Private_0_1 */
3182 3187
3183 static PP_Bool Pnacl_M17_PPB_NetAddress_Private_AreEqual(const struct PP_NetAddr ess_Private* addr1, const struct PP_NetAddress_Private* addr2) { 3188 static PP_Bool Pnacl_M17_PPB_NetAddress_Private_AreEqual(const struct PP_NetAddr ess_Private* addr1, const struct PP_NetAddress_Private* addr2) {
3184 const struct PPB_NetAddress_Private_0_1 *iface = Pnacl_WrapperInfo_PPB_NetAddr ess_Private_0_1.real_iface; 3189 const struct PPB_NetAddress_Private_0_1 *iface = Pnacl_WrapperInfo_PPB_NetAddr ess_Private_0_1.real_iface;
3185 return iface->AreEqual(addr1, addr2); 3190 return iface->AreEqual(addr1, addr2);
3186 } 3191 }
3187 3192
3188 static PP_Bool Pnacl_M17_PPB_NetAddress_Private_AreHostsEqual(const struct PP_Ne tAddress_Private* addr1, const struct PP_NetAddress_Private* addr2) { 3193 static PP_Bool Pnacl_M17_PPB_NetAddress_Private_AreHostsEqual(const struct PP_Ne tAddress_Private* addr1, const struct PP_NetAddress_Private* addr2) {
(...skipping 1867 matching lines...) Expand 10 before | Expand all | Expand 10 after
5056 .CreateTemporaryFile = (PP_FileHandle (*)(PP_Instance instance))&Pnacl_M25_P PB_NaCl_Private_CreateTemporaryFile, 5061 .CreateTemporaryFile = (PP_FileHandle (*)(PP_Instance instance))&Pnacl_M25_P PB_NaCl_Private_CreateTemporaryFile,
5057 .GetNumberOfProcessors = (int32_t (*)(void))&Pnacl_M25_PPB_NaCl_Private_GetN umberOfProcessors, 5062 .GetNumberOfProcessors = (int32_t (*)(void))&Pnacl_M25_PPB_NaCl_Private_GetN umberOfProcessors,
5058 .IsNonSFIModeEnabled = (PP_Bool (*)(void))&Pnacl_M25_PPB_NaCl_Private_IsNonS FIModeEnabled, 5063 .IsNonSFIModeEnabled = (PP_Bool (*)(void))&Pnacl_M25_PPB_NaCl_Private_IsNonS FIModeEnabled,
5059 .GetNexeFd = (int32_t (*)(PP_Instance instance, const char* pexe_url, uint32 _t abi_version, uint32_t opt_level, const char* last_modified, const char* etag, PP_Bool has_no_store_header, const char* sandbox_isa, const char* extra_flags, PP_Bool* is_hit, PP_FileHandle* nexe_handle, struct PP_CompletionCallback callba ck))&Pnacl_M25_PPB_NaCl_Private_GetNexeFd, 5064 .GetNexeFd = (int32_t (*)(PP_Instance instance, const char* pexe_url, uint32 _t abi_version, uint32_t opt_level, const char* last_modified, const char* etag, PP_Bool has_no_store_header, const char* sandbox_isa, const char* extra_flags, PP_Bool* is_hit, PP_FileHandle* nexe_handle, struct PP_CompletionCallback callba ck))&Pnacl_M25_PPB_NaCl_Private_GetNexeFd,
5060 .ReportTranslationFinished = (void (*)(PP_Instance instance, PP_Bool success ))&Pnacl_M25_PPB_NaCl_Private_ReportTranslationFinished, 5065 .ReportTranslationFinished = (void (*)(PP_Instance instance, PP_Bool success ))&Pnacl_M25_PPB_NaCl_Private_ReportTranslationFinished,
5061 .OpenNaClExecutable = (PP_FileHandle (*)(PP_Instance instance, const char* f ile_url, uint64_t* file_token_lo, uint64_t* file_token_hi))&Pnacl_M25_PPB_NaCl_P rivate_OpenNaClExecutable, 5066 .OpenNaClExecutable = (PP_FileHandle (*)(PP_Instance instance, const char* f ile_url, uint64_t* file_token_lo, uint64_t* file_token_hi))&Pnacl_M25_PPB_NaCl_P rivate_OpenNaClExecutable,
5062 .DispatchEvent = (void (*)(PP_Instance instance, PP_NaClEventType event_type , const char* resource_url, PP_Bool length_is_computable, uint64_t loaded_bytes, uint64_t total_bytes))&Pnacl_M25_PPB_NaCl_Private_DispatchEvent, 5067 .DispatchEvent = (void (*)(PP_Instance instance, PP_NaClEventType event_type , const char* resource_url, PP_Bool length_is_computable, uint64_t loaded_bytes, uint64_t total_bytes))&Pnacl_M25_PPB_NaCl_Private_DispatchEvent,
5063 .SetReadOnlyProperty = (void (*)(PP_Instance instance, struct PP_Var key, st ruct PP_Var value))&Pnacl_M25_PPB_NaCl_Private_SetReadOnlyProperty, 5068 .SetReadOnlyProperty = (void (*)(PP_Instance instance, struct PP_Var key, st ruct PP_Var value))&Pnacl_M25_PPB_NaCl_Private_SetReadOnlyProperty,
5064 .ReportLoadError = (void (*)(PP_Instance instance, PP_NaClError error, PP_Bo ol is_installed))&Pnacl_M25_PPB_NaCl_Private_ReportLoadError, 5069 .ReportLoadError = (void (*)(PP_Instance instance, PP_NaClError error, PP_Bo ol is_installed))&Pnacl_M25_PPB_NaCl_Private_ReportLoadError,
5065 .InstanceDestroyed = (void (*)(PP_Instance instance))&Pnacl_M25_PPB_NaCl_Pri vate_InstanceDestroyed, 5070 .InstanceDestroyed = (void (*)(PP_Instance instance))&Pnacl_M25_PPB_NaCl_Pri vate_InstanceDestroyed,
5066 .NaClDebugStubEnabled = (PP_Bool (*)(void))&Pnacl_M25_PPB_NaCl_Private_NaClD ebugStubEnabled 5071 .NaClDebugStubEnabled = (PP_Bool (*)(void))&Pnacl_M25_PPB_NaCl_Private_NaClD ebugStubEnabled,
5072 .GetSandboxArch = (const char* (*)(void))&Pnacl_M25_PPB_NaCl_Private_GetSand boxArch
5067 }; 5073 };
5068 5074
5069 static const struct PPB_NetAddress_Private_0_1 Pnacl_Wrappers_PPB_NetAddress_Pri vate_0_1 = { 5075 static const struct PPB_NetAddress_Private_0_1 Pnacl_Wrappers_PPB_NetAddress_Pri vate_0_1 = {
5070 .AreEqual = (PP_Bool (*)(const struct PP_NetAddress_Private* addr1, const st ruct PP_NetAddress_Private* addr2))&Pnacl_M17_PPB_NetAddress_Private_AreEqual, 5076 .AreEqual = (PP_Bool (*)(const struct PP_NetAddress_Private* addr1, const st ruct PP_NetAddress_Private* addr2))&Pnacl_M17_PPB_NetAddress_Private_AreEqual,
5071 .AreHostsEqual = (PP_Bool (*)(const struct PP_NetAddress_Private* addr1, con st struct PP_NetAddress_Private* addr2))&Pnacl_M17_PPB_NetAddress_Private_AreHos tsEqual, 5077 .AreHostsEqual = (PP_Bool (*)(const struct PP_NetAddress_Private* addr1, con st struct PP_NetAddress_Private* addr2))&Pnacl_M17_PPB_NetAddress_Private_AreHos tsEqual,
5072 .Describe = (struct PP_Var (*)(PP_Module module, const struct PP_NetAddress_ Private* addr, PP_Bool include_port))&Pnacl_M17_PPB_NetAddress_Private_Describe, 5078 .Describe = (struct PP_Var (*)(PP_Module module, const struct PP_NetAddress_ Private* addr, PP_Bool include_port))&Pnacl_M17_PPB_NetAddress_Private_Describe,
5073 .ReplacePort = (PP_Bool (*)(const struct PP_NetAddress_Private* src_addr, ui nt16_t port, struct PP_NetAddress_Private* addr_out))&Pnacl_M17_PPB_NetAddress_P rivate_ReplacePort, 5079 .ReplacePort = (PP_Bool (*)(const struct PP_NetAddress_Private* src_addr, ui nt16_t port, struct PP_NetAddress_Private* addr_out))&Pnacl_M17_PPB_NetAddress_P rivate_ReplacePort,
5074 .GetAnyAddress = (void (*)(PP_Bool is_ipv6, struct PP_NetAddress_Private* ad dr))&Pnacl_M17_PPB_NetAddress_Private_GetAnyAddress 5080 .GetAnyAddress = (void (*)(PP_Bool is_ipv6, struct PP_NetAddress_Private* ad dr))&Pnacl_M17_PPB_NetAddress_Private_GetAnyAddress
5075 }; 5081 };
5076 5082
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after
6121 6127
6122 /* Initialize the real_iface if it hasn't been. The wrapper depends on it. */ 6128 /* Initialize the real_iface if it hasn't been. The wrapper depends on it. */
6123 if (wrapper->real_iface == NULL) { 6129 if (wrapper->real_iface == NULL) {
6124 const void *iface = (*__real_PPPGetInterface)(name); 6130 const void *iface = (*__real_PPPGetInterface)(name);
6125 if (NULL == iface) return NULL; 6131 if (NULL == iface) return NULL;
6126 wrapper->real_iface = iface; 6132 wrapper->real_iface = iface;
6127 } 6133 }
6128 6134
6129 return wrapper->wrapped_iface; 6135 return wrapper->wrapped_iface;
6130 } 6136 }
OLDNEW
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698