diff options
| author | mseaborn <mseaborn@chromium.org> | 2015-02-09 08:13:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-09 16:14:17 +0000 |
| commit | 3faf5be059e1a62895f4ef665f2dc5e628bde4b8 (patch) | |
| tree | 2b9e51fc2159c8ffdf4c78e74cef4f424cdab14f /ppapi | |
| parent | bcfc1b3cc8e59d4be12a4317ec95fbc97460a00c (diff) | |
| download | chromium_src-3faf5be059e1a62895f4ef665f2dc5e628bde4b8.zip chromium_src-3faf5be059e1a62895f4ef665f2dc5e628bde4b8.tar.gz chromium_src-3faf5be059e1a62895f4ef665f2dc5e628bde4b8.tar.bz2 | |
NaCl cleanup: Remove references to native_client/src/public/nacl_file_info.h
It's no longer necessary for the NaCl side to define and refer to the
NaClFileToken struct.
So we can change the Chromium side to define NaClFileToken, instead of
using the definition from nacl_file_info.h. This will let us remove
nacl_file_info.h from the NaCl side.
We copy the comment from nacl_file_info.h.
BUG=https://code.google.com/p/nativeclient/issues/detail?id=4073
TEST=build
Review URL: https://codereview.chromium.org/903333002
Cr-Commit-Position: refs/heads/master@{#315317}
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/api/private/ppb_nacl_private.idl | 4 | ||||
| -rw-r--r-- | ppapi/c/private/ppb_nacl_private.h | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ppapi/api/private/ppb_nacl_private.idl b/ppapi/api/private/ppb_nacl_private.idl index 37c1155..be777fc 100644 --- a/ppapi/api/private/ppb_nacl_private.idl +++ b/ppapi/api/private/ppb_nacl_private.idl @@ -154,12 +154,10 @@ struct PP_PNaClOptions { typedef void PP_OpenResourceCompletionCallback([inout] mem_t user_data, [in] PP_FileHandle file_handle); -/* Corresponds to NaClFileInfo in - * native_client/src/trusted/validator/nacl_file_info.h */ struct PP_NaClFileInfo { PP_FileHandle handle; - /* See NaClFileToken comment in nacl_file_info.h */ + /* See NaClFileToken comment in nacl_process_host.h */ uint64_t token_lo; uint64_t token_hi; }; diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h index e80e35e..3c29b1e 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 Fri Jan 23 09:09:44 2015. */ +/* From private/ppb_nacl_private.idl modified Sun Feb 8 11:33:30 2015. */ #ifndef PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ #define PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ @@ -191,11 +191,9 @@ typedef void (*PP_OpenResourceCompletionCallback)(void* user_data, * @addtogroup Structs * @{ */ -/* Corresponds to NaClFileInfo in - * native_client/src/trusted/validator/nacl_file_info.h */ struct PP_NaClFileInfo { PP_FileHandle handle; - /* See NaClFileToken comment in nacl_file_info.h */ + /* See NaClFileToken comment in nacl_process_host.h */ uint64_t token_lo; uint64_t token_hi; }; |