diff options
Diffstat (limited to 'ppapi/c/dev')
| -rw-r--r-- | ppapi/c/dev/ppb_buffer_dev.h | 4 | ||||
| -rw-r--r-- | ppapi/c/dev/ppb_char_set_dev.h | 10 | ||||
| -rw-r--r-- | ppapi/c/dev/ppb_file_io_dev.h | 4 | ||||
| -rw-r--r-- | ppapi/c/dev/ppb_font_dev.h | 4 | ||||
| -rw-r--r-- | ppapi/c/dev/ppb_transport_dev.h | 2 |
5 files changed, 13 insertions, 11 deletions
diff --git a/ppapi/c/dev/ppb_buffer_dev.h b/ppapi/c/dev/ppb_buffer_dev.h index 6788772..49252d6 100644 --- a/ppapi/c/dev/ppb_buffer_dev.h +++ b/ppapi/c/dev/ppb_buffer_dev.h @@ -6,7 +6,7 @@ #define PPAPI_C_DEV_PPB_BUFFER_DEV_H_ #include "ppapi/c/pp_bool.h" -#include "ppapi/c/pp_module.h" +#include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" @@ -16,7 +16,7 @@ struct PPB_Buffer_Dev { // Allocates a buffer of the given size in bytes. The return value will have // a non-zero ID on success, or zero on failure. Failure means the module // handle was invalid. The buffer will be initialized to contain zeroes. - PP_Resource (*Create)(PP_Module module, uint32_t size_in_bytes); + PP_Resource (*Create)(PP_Instance instance, uint32_t size_in_bytes); // Returns PP_TRUE if the given resource is a Buffer. Returns PP_FALSE if the // resource is invalid or some type other than a Buffer. diff --git a/ppapi/c/dev/ppb_char_set_dev.h b/ppapi/c/dev/ppb_char_set_dev.h index 74c1ca5..6aca03715 100644 --- a/ppapi/c/dev/ppb_char_set_dev.h +++ b/ppapi/c/dev/ppb_char_set_dev.h @@ -5,8 +5,8 @@ #ifndef PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_ #define PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_ +#include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_module.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_var.h" @@ -50,7 +50,8 @@ struct PPB_CharSet_Dev { // This function will return NULL if there was an error converting the string // and you requested PP_CHARSET_CONVERSIONERROR_FAIL, or the output character // set was unknown. - char* (*UTF16ToCharSet)(const uint16_t* utf16, uint32_t utf16_len, + char* (*UTF16ToCharSet)(PP_Instance instance, + const uint16_t* utf16, uint32_t utf16_len, const char* output_char_set, enum PP_CharSet_ConversionError on_error, uint32_t* output_length); @@ -63,7 +64,8 @@ struct PPB_CharSet_Dev { // Since UTF16 can represent every Unicode character, the only time the // replacement character will be used is if the encoding in the input string // is incorrect. - uint16_t* (*CharSetToUTF16)(const char* input, uint32_t input_len, + uint16_t* (*CharSetToUTF16)(PP_Instance instance, + const char* input, uint32_t input_len, const char* input_char_set, enum PP_CharSet_ConversionError on_error, uint32_t* output_length); @@ -74,7 +76,7 @@ struct PPB_CharSet_Dev { // WARNING: You really shouldn't be using this function unless you're dealing // with legacy data. You should be using UTF-8 or UTF-16 and you don't have // to worry about the character sets. - struct PP_Var (*GetDefaultCharSet)(PP_Module module); + struct PP_Var (*GetDefaultCharSet)(PP_Instance instance); }; #endif /* PPAPI_C_DEV_PPB_CHAR_SET_DEV_H_ */ diff --git a/ppapi/c/dev/ppb_file_io_dev.h b/ppapi/c/dev/ppb_file_io_dev.h index ee7324d..0758ca9 100644 --- a/ppapi/c/dev/ppb_file_io_dev.h +++ b/ppapi/c/dev/ppb_file_io_dev.h @@ -6,8 +6,8 @@ #define PPAPI_C_DEV_PPB_FILE_IO_DEV_H_ #include "ppapi/c/pp_bool.h" +#include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_module.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_time.h" @@ -44,7 +44,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileOpenFlags_Dev, 4); // Use this interface to operate on a regular file (PP_FileType_Regular). struct PPB_FileIO_Dev { // Creates a new FileIO object. Returns 0 if the module is invalid. - PP_Resource (*Create)(PP_Module module); + PP_Resource (*Create)(PP_Instance instance); // Returns PP_TRUE if the given resource is a FileIO. Returns PP_FALSE if the // resource is invalid or some type other than a FileIO. diff --git a/ppapi/c/dev/ppb_font_dev.h b/ppapi/c/dev/ppb_font_dev.h index 2262856..e2bba3c 100644 --- a/ppapi/c/dev/ppb_font_dev.h +++ b/ppapi/c/dev/ppb_font_dev.h @@ -6,8 +6,8 @@ #define PPAPI_C_DEV_PPB_FONT_DEV_H_ #include "ppapi/c/pp_bool.h" +#include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_macros.h" -#include "ppapi/c/pp_module.h" #include "ppapi/c/pp_resource.h" #include "ppapi/c/pp_stdint.h" #include "ppapi/c/pp_var.h" @@ -103,7 +103,7 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_TextRun_Dev, 24); struct PPB_Font_Dev { // Returns a font which best matches the given description. The return value // will have a non-zero ID on success, or zero on failure. - PP_Resource (*Create)(PP_Module module, + PP_Resource (*Create)(PP_Instance instance, const struct PP_FontDescription_Dev* description); // Returns PP_TRUE if the given resource is a Font. Returns PP_FALSE if the diff --git a/ppapi/c/dev/ppb_transport_dev.h b/ppapi/c/dev/ppb_transport_dev.h index 1e56ff4..7dc9ad3 100644 --- a/ppapi/c/dev/ppb_transport_dev.h +++ b/ppapi/c/dev/ppb_transport_dev.h @@ -18,7 +18,7 @@ struct PPB_Transport_Dev { // Creates a new transport object with the specified name // using the specified protocol. - PP_Resource (*CreateTransport)(PP_Module module, + PP_Resource (*CreateTransport)(PP_Instance instance, const char* name, const char* proto); |