diff options
author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 03:48:24 +0000 |
---|---|---|
committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 03:48:24 +0000 |
commit | 7d0284e0c4638201635bccec014a6a8f08e58131 (patch) | |
tree | ba4e4f4a30e43b2e24773ad9b440f49d23958ac3 /ppapi/c | |
parent | 9d56dd31573039d45135ec516260bcc070cc284f (diff) | |
download | chromium_src-7d0284e0c4638201635bccec014a6a8f08e58131.zip chromium_src-7d0284e0c4638201635bccec014a6a8f08e58131.tar.gz chromium_src-7d0284e0c4638201635bccec014a6a8f08e58131.tar.bz2 |
Reland http://codereview.chromium.org/7292033
Plus bonus change to a comment in pp_bool.h to try to get the bots to rebuild things properly
------
First pass at revving stable pepper interfaces to 1.0.
Missing PPB_Core (pending removal of MemAlloc/MemFree) and new input event interfaces, in case we want to change them in the next ~week.
BUG=84519
TEST=ppapi tests
TBR=dmichael
Review URL: http://codereview.chromium.org/7355014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c')
-rw-r--r-- | ppapi/c/pp_bool.h | 4 | ||||
-rw-r--r-- | ppapi/c/ppb_audio.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_audio_config.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_file_io.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_file_ref.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_file_system.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_graphics_2d.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_image_data.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_instance.h | 7 | ||||
-rw-r--r-- | ppapi/c/ppb_messaging.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_url_loader.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_url_request_info.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_url_response_info.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppb_var.h | 3 | ||||
-rw-r--r-- | ppapi/c/ppp_messaging.h | 4 |
15 files changed, 33 insertions, 18 deletions
diff --git a/ppapi/c/pp_bool.h b/ppapi/c/pp_bool.h index 961075d..acd7ce1 100644 --- a/ppapi/c/pp_bool.h +++ b/ppapi/c/pp_bool.h @@ -22,8 +22,8 @@ /** * The <code>PP_Bool</code> enum is a boolean value for use in PPAPI C headers. * The standard bool type is not available to pre-C99 compilers, and is not - * guaranteed to be compatible between C and C++, whereas the PPAPI C - * headers can be included from C or C++ code. + * guaranteed to be compatible between C and C++, whereas the PPAPI C headers + * can be included from C or C++ code. */ typedef enum { PP_FALSE = 0, diff --git a/ppapi/c/ppb_audio.h b/ppapi/c/ppb_audio.h index 1ee4fbf..564a2b0 100644 --- a/ppapi/c/ppb_audio.h +++ b/ppapi/c/ppb_audio.h @@ -11,7 +11,8 @@ #include "ppapi/c/pp_stdint.h" #define PPB_AUDIO_INTERFACE_0_6 "PPB_Audio;0.6" -#define PPB_AUDIO_INTERFACE PPB_AUDIO_INTERFACE_0_6 +#define PPB_AUDIO_INTERFACE_1_0 "PPB_Audio;1.0" +#define PPB_AUDIO_INTERFACE PPB_AUDIO_INTERFACE_1_0 /** * @file diff --git a/ppapi/c/ppb_audio_config.h b/ppapi/c/ppb_audio_config.h index 033ac3c..71d486d 100644 --- a/ppapi/c/ppb_audio_config.h +++ b/ppapi/c/ppb_audio_config.h @@ -12,7 +12,8 @@ #include "ppapi/c/pp_stdint.h" #define PPB_AUDIO_CONFIG_INTERFACE_0_5 "PPB_AudioConfig;0.5" -#define PPB_AUDIO_CONFIG_INTERFACE PPB_AUDIO_CONFIG_INTERFACE_0_5 +#define PPB_AUDIO_CONFIG_INTERFACE_1_0 "PPB_AudioConfig;1.0" +#define PPB_AUDIO_CONFIG_INTERFACE PPB_AUDIO_CONFIG_INTERFACE_1_0 /** * @file diff --git a/ppapi/c/ppb_file_io.h b/ppapi/c/ppb_file_io.h index 364e14d..7f8b130 100644 --- a/ppapi/c/ppb_file_io.h +++ b/ppapi/c/ppb_file_io.h @@ -64,7 +64,8 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FileOpenFlags, 4); */ #define PPB_FILEIO_INTERFACE_0_5 "PPB_FileIO;0.5" -#define PPB_FILEIO_INTERFACE PPB_FILEIO_INTERFACE_0_5 +#define PPB_FILEIO_INTERFACE_1_0 "PPB_FileIO;1.0" +#define PPB_FILEIO_INTERFACE PPB_FILEIO_INTERFACE_1_0 /** * @addtogroup Interfaces diff --git a/ppapi/c/ppb_file_ref.h b/ppapi/c/ppb_file_ref.h index 2702d35..e204c28 100644 --- a/ppapi/c/ppb_file_ref.h +++ b/ppapi/c/ppb_file_ref.h @@ -20,7 +20,8 @@ struct PP_CompletionCallback; #define PPB_FILEREF_INTERFACE_0_9 "PPB_FileRef;0.9" -#define PPB_FILEREF_INTERFACE PPB_FILEREF_INTERFACE_0_9 +#define PPB_FILEREF_INTERFACE_1_0 "PPB_FileRef;1.0" +#define PPB_FILEREF_INTERFACE PPB_FILEREF_INTERFACE_1_0 /** * @addtogroup Structs diff --git a/ppapi/c/ppb_file_system.h b/ppapi/c/ppb_file_system.h index 47e26a1..59b3d51 100644 --- a/ppapi/c/ppb_file_system.h +++ b/ppapi/c/ppb_file_system.h @@ -20,7 +20,8 @@ struct PP_CompletionCallback; #define PPB_FILESYSTEM_INTERFACE_0_7 "PPB_FileSystem;0.7" -#define PPB_FILESYSTEM_INTERFACE PPB_FILESYSTEM_INTERFACE_0_7 +#define PPB_FILESYSTEM_INTERFACE_1_0 "PPB_FileSystem;1.0" +#define PPB_FILESYSTEM_INTERFACE PPB_FILESYSTEM_INTERFACE_1_0 /** * @addtogroup Structs diff --git a/ppapi/c/ppb_graphics_2d.h b/ppapi/c/ppb_graphics_2d.h index 1fc33da..6020b050 100644 --- a/ppapi/c/ppb_graphics_2d.h +++ b/ppapi/c/ppb_graphics_2d.h @@ -17,7 +17,8 @@ struct PP_Rect; struct PP_Size; #define PPB_GRAPHICS_2D_INTERFACE_0_4 "PPB_Graphics2D;0.4" -#define PPB_GRAPHICS_2D_INTERFACE PPB_GRAPHICS_2D_INTERFACE_0_4 +#define PPB_GRAPHICS_2D_INTERFACE_1_0 "PPB_Graphics2D;1.0" +#define PPB_GRAPHICS_2D_INTERFACE PPB_GRAPHICS_2D_INTERFACE_1_0 /** * @file diff --git a/ppapi/c/ppb_image_data.h b/ppapi/c/ppb_image_data.h index d7c8c82..c63148b 100644 --- a/ppapi/c/ppb_image_data.h +++ b/ppapi/c/ppb_image_data.h @@ -97,7 +97,8 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_ImageDataDesc, 16); */ #define PPB_IMAGEDATA_INTERFACE_0_3 "PPB_ImageData;0.3" -#define PPB_IMAGEDATA_INTERFACE PPB_IMAGEDATA_INTERFACE_0_3 +#define PPB_IMAGEDATA_INTERFACE_1_0 "PPB_ImageData;1.0" +#define PPB_IMAGEDATA_INTERFACE PPB_IMAGEDATA_INTERFACE_1_0 /** * @addtogroup Interfaces diff --git a/ppapi/c/ppb_instance.h b/ppapi/c/ppb_instance.h index 1e49ee8..dbda74d6 100644 --- a/ppapi/c/ppb_instance.h +++ b/ppapi/c/ppb_instance.h @@ -12,8 +12,9 @@ #define PPB_INSTANCE_INTERFACE_0_4 "PPB_Instance;0.4" #define PPB_INSTANCE_INTERFACE_0_5 "PPB_Instance;0.5" +#define PPB_INSTANCE_INTERFACE_1_0 "PPB_Instance;1.0" #ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING -#define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_0_5 +#define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_1_0 #else #define PPB_INSTANCE_INTERFACE PPB_INSTANCE_INTERFACE_0_4 #endif @@ -37,7 +38,7 @@ #ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING struct PPB_Instance { #else -struct PPB_Instance_0_5 { +struct PPB_Instance_1_0 { #endif /** * BindGraphics() binds the given graphics as the current drawing surface. @@ -100,7 +101,7 @@ struct PPB_Instance { }; #ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING -typedef struct PPB_Instance PPB_Instance_0_5; +typedef struct PPB_Instance PPB_Instance_1_0; #else typedef struct PPB_Instance PPB_Instance_0_4; #endif diff --git a/ppapi/c/ppb_messaging.h b/ppapi/c/ppb_messaging.h index 5312323..b5b729b 100644 --- a/ppapi/c/ppb_messaging.h +++ b/ppapi/c/ppb_messaging.h @@ -9,7 +9,8 @@ #include "ppapi/c/pp_var.h" #define PPB_MESSAGING_INTERFACE_0_1 "PPB_Messaging;0.1" -#define PPB_MESSAGING_INTERFACE PPB_MESSAGING_INTERFACE_0_1 +#define PPB_MESSAGING_INTERFACE_1_0 "PPB_Messaging;1.0" +#define PPB_MESSAGING_INTERFACE PPB_MESSAGING_INTERFACE_1_0 /** * @file diff --git a/ppapi/c/ppb_url_loader.h b/ppapi/c/ppb_url_loader.h index 0ce27c0..3949f20 100644 --- a/ppapi/c/ppb_url_loader.h +++ b/ppapi/c/ppb_url_loader.h @@ -12,7 +12,8 @@ #include "ppapi/c/pp_stdint.h" #define PPB_URLLOADER_INTERFACE_0_2 "PPB_URLLoader;0.2" -#define PPB_URLLOADER_INTERFACE PPB_URLLOADER_INTERFACE_0_2 +#define PPB_URLLOADER_INTERFACE_1_0 "PPB_URLLoader;1.0" +#define PPB_URLLOADER_INTERFACE PPB_URLLOADER_INTERFACE_1_0 /** * @file diff --git a/ppapi/c/ppb_url_request_info.h b/ppapi/c/ppb_url_request_info.h index 820dd57..83f17c1 100644 --- a/ppapi/c/ppb_url_request_info.h +++ b/ppapi/c/ppb_url_request_info.h @@ -158,7 +158,8 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLRequestProperty, 4); */ #define PPB_URLREQUESTINFO_INTERFACE_0_2 "PPB_URLRequestInfo;0.2" -#define PPB_URLREQUESTINFO_INTERFACE PPB_URLREQUESTINFO_INTERFACE_0_2 +#define PPB_URLREQUESTINFO_INTERFACE_1_0 "PPB_URLRequestInfo;1.0" +#define PPB_URLREQUESTINFO_INTERFACE PPB_URLREQUESTINFO_INTERFACE_1_0 /** * diff --git a/ppapi/c/ppb_url_response_info.h b/ppapi/c/ppb_url_response_info.h index 3894471..93051d4 100644 --- a/ppapi/c/ppb_url_response_info.h +++ b/ppapi/c/ppb_url_response_info.h @@ -87,7 +87,8 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_URLResponseProperty, 4); */ #define PPB_URLRESPONSEINFO_INTERFACE_0_1 "PPB_URLResponseInfo;0.1" -#define PPB_URLRESPONSEINFO_INTERFACE PPB_URLRESPONSEINFO_INTERFACE_0_1 +#define PPB_URLRESPONSEINFO_INTERFACE_1_0 "PPB_URLResponseInfo;1.0" +#define PPB_URLRESPONSEINFO_INTERFACE PPB_URLRESPONSEINFO_INTERFACE_1_0 /** * diff --git a/ppapi/c/ppb_var.h b/ppapi/c/ppb_var.h index d22b5ce..ecd7514 100644 --- a/ppapi/c/ppb_var.h +++ b/ppapi/c/ppb_var.h @@ -12,7 +12,8 @@ #include "ppapi/c/pp_var.h" #define PPB_VAR_INTERFACE_0_5 "PPB_Var;0.5" -#define PPB_VAR_INTERFACE PPB_VAR_INTERFACE_0_5 +#define PPB_VAR_INTERFACE_1_0 "PPB_Var;1.0" +#define PPB_VAR_INTERFACE PPB_VAR_INTERFACE_1_0 /** * @file diff --git a/ppapi/c/ppp_messaging.h b/ppapi/c/ppp_messaging.h index 29a7976..c36ed96 100644 --- a/ppapi/c/ppp_messaging.h +++ b/ppapi/c/ppp_messaging.h @@ -9,7 +9,9 @@ struct PP_Var; -#define PPP_MESSAGING_INTERFACE "PPP_Messaging;0.1" +#define PPP_MESSAGING_INTERFACE_0_1 "PPP_Messaging;0.1" +#define PPP_MESSAGING_INTERFACE_1_0 "PPP_Messaging;1.0" +#define PPP_MESSAGING_INTERFACE PPP_MESSAGING_INTERFACE_1_0 /** * @file |