summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/c/pp_bool.h4
-rw-r--r--ppapi/c/ppb_audio.h3
-rw-r--r--ppapi/c/ppb_audio_config.h3
-rw-r--r--ppapi/c/ppb_file_io.h3
-rw-r--r--ppapi/c/ppb_file_ref.h3
-rw-r--r--ppapi/c/ppb_file_system.h3
-rw-r--r--ppapi/c/ppb_graphics_2d.h3
-rw-r--r--ppapi/c/ppb_image_data.h3
-rw-r--r--ppapi/c/ppb_instance.h7
-rw-r--r--ppapi/c/ppb_messaging.h3
-rw-r--r--ppapi/c/ppb_url_loader.h3
-rw-r--r--ppapi/c/ppb_url_request_info.h3
-rw-r--r--ppapi/c/ppb_url_response_info.h3
-rw-r--r--ppapi/c/ppb_var.h3
-rw-r--r--ppapi/c/ppp_messaging.h4
-rw-r--r--ppapi/proxy/dispatcher.cc1
-rw-r--r--ppapi/proxy/ppb_instance_proxy.cc16
-rw-r--r--ppapi/proxy/ppb_instance_proxy.h1
-rw-r--r--ppapi/thunk/ppb_instance_thunk.cc6
-rw-r--r--ppapi/thunk/thunk.h6
20 files changed, 55 insertions, 26 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
diff --git a/ppapi/proxy/dispatcher.cc b/ppapi/proxy/dispatcher.cc
index ad32beb..e9b57c3 100644
--- a/ppapi/proxy/dispatcher.cc
+++ b/ppapi/proxy/dispatcher.cc
@@ -141,6 +141,7 @@ InterfaceList::InterfaceList() {
AddPPB(PPB_InputEvent_Proxy::GetInfo());
AddPPB(PPB_Instance_Proxy::GetInfo0_4());
AddPPB(PPB_Instance_Proxy::GetInfo0_5());
+ AddPPB(PPB_Instance_Proxy::GetInfo1_0());
AddPPB(PPB_Instance_Proxy::GetInfoFullscreen());
AddPPB(PPB_Instance_Proxy::GetInfoMessaging());
AddPPB(PPB_Instance_Proxy::GetInfoPrivate());
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index 7c3827f..5a6158a 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -51,7 +51,7 @@ const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo0_4() {
static const Info info = {
ppapi::thunk::GetPPB_Instance_0_4_Thunk(),
PPB_INSTANCE_INTERFACE_0_4,
- INTERFACE_ID_NONE, // 0_5 is the canonical one.
+ INTERFACE_ID_NONE, // 1_0 is the canonical one.
false,
&CreateInstanceProxy,
};
@@ -61,8 +61,20 @@ const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo0_4() {
// static
const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo0_5() {
static const Info info = {
- ppapi::thunk::GetPPB_Instance_0_5_Thunk(),
+ ppapi::thunk::GetPPB_Instance_1_0_Thunk(),
PPB_INSTANCE_INTERFACE_0_5,
+ INTERFACE_ID_NONE, // 1_0 is the canonical one.
+ false,
+ &CreateInstanceProxy,
+ };
+ return &info;
+}
+
+// static
+const InterfaceProxy::Info* PPB_Instance_Proxy::GetInfo1_0() {
+ static const Info info = {
+ ppapi::thunk::GetPPB_Instance_1_0_Thunk(),
+ PPB_INSTANCE_INTERFACE_1_0,
INTERFACE_ID_PPB_INSTANCE,
false,
&CreateInstanceProxy,
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index d4de0a4..9d045fb 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -31,6 +31,7 @@ class PPB_Instance_Proxy : public InterfaceProxy,
static const Info* GetInfo0_4();
static const Info* GetInfo0_5();
+ static const Info* GetInfo1_0();
static const Info* GetInfoMessaging();
static const Info* GetInfoPrivate();
static const Info* GetInfoFullscreen();
diff --git a/ppapi/thunk/ppb_instance_thunk.cc b/ppapi/thunk/ppb_instance_thunk.cc
index 025e3e0..3d7ef60 100644
--- a/ppapi/thunk/ppb_instance_thunk.cc
+++ b/ppapi/thunk/ppb_instance_thunk.cc
@@ -49,7 +49,7 @@ PP_Var ExecuteScript(PP_Instance instance,
return enter.functions()->ExecuteScript(instance, script, exception);
}
-const PPB_Instance_0_5 g_ppb_instance_0_5_thunk = {
+const PPB_Instance_1_0 g_ppb_instance_1_0_thunk = {
&BindGraphics,
&IsFullFrame
};
@@ -73,8 +73,8 @@ const PPB_Instance_Private g_ppb_instance_private_thunk = {
const PPB_Instance_0_4* GetPPB_Instance_0_4_Thunk() {
return &g_ppb_instance_0_4_thunk;
}
-const PPB_Instance_0_5* GetPPB_Instance_0_5_Thunk() {
- return &g_ppb_instance_0_5_thunk;
+const PPB_Instance_1_0* GetPPB_Instance_1_0_Thunk() {
+ return &g_ppb_instance_1_0_thunk;
}
const PPB_Instance_Private* GetPPB_Instance_Private_Thunk() {
return &g_ppb_instance_private_thunk;
diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h
index b02b920..e03a8e1 100644
--- a/ppapi/thunk/thunk.h
+++ b/ppapi/thunk/thunk.h
@@ -54,9 +54,9 @@ struct PPB_Zoom_Dev;
#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
struct PPB_Instance_0_4;
-typedef PPB_Instance PPB_Instance_0_5;
+typedef PPB_Instance PPB_Instance_1_0;
#else
-struct PPB_Instance_0_5;
+struct PPB_Instance_1_0;
typedef PPB_Instance PPB_Instance_0_4;
#endif
@@ -93,7 +93,7 @@ const PPB_InputEvent* GetPPB_InputEvent_Thunk();
const PPB_ImageData* GetPPB_ImageData_Thunk();
const PPB_ImageDataTrusted* GetPPB_ImageDataTrusted_Thunk();
const PPB_Instance_0_4* GetPPB_Instance_0_4_Thunk();
-const PPB_Instance_0_5* GetPPB_Instance_0_5_Thunk();
+const PPB_Instance_1_0* GetPPB_Instance_1_0_Thunk();
const PPB_Instance_Private* GetPPB_Instance_Private_Thunk();
const PPB_KeyboardInputEvent* GetPPB_KeyboardInputEvent_Thunk();
const PPB_LayerCompositor_Dev* GetPPB_LayerCompositor_Thunk();
generated by cgit v1.1 at 2025-01-19 16:09:32 +0000