Index: ppapi/c/private/ppb_flash.h |
diff --git a/ppapi/c/private/ppb_flash.h b/ppapi/c/private/ppb_flash.h |
index 0279556524ec0ffc53a7047eae1aa1ca62b7a239..36645ccb62b554b30e22f6f990e6e88bd32409ff 100644 |
--- a/ppapi/c/private/ppb_flash.h |
+++ b/ppapi/c/private/ppb_flash.h |
@@ -3,7 +3,7 @@ |
* found in the LICENSE file. |
*/ |
-/* From private/ppb_flash.idl modified Mon Oct 8 13:03:27 2012. */ |
+/* From private/ppb_flash.idl modified Tue Nov 20 10:12:16 2012. */ |
#ifndef PPAPI_C_PRIVATE_PPB_FLASH_H_ |
#define PPAPI_C_PRIVATE_PPB_FLASH_H_ |
@@ -22,14 +22,11 @@ |
#include "ppapi/c/pp_time.h" |
#include "ppapi/c/pp_var.h" |
-#define PPB_FLASH_INTERFACE_12_0 "PPB_Flash;12.0" |
-#define PPB_FLASH_INTERFACE_12_1 "PPB_Flash;12.1" |
-#define PPB_FLASH_INTERFACE_12_2 "PPB_Flash;12.2" |
-#define PPB_FLASH_INTERFACE_12_3 "PPB_Flash;12.3" |
#define PPB_FLASH_INTERFACE_12_4 "PPB_Flash;12.4" |
#define PPB_FLASH_INTERFACE_12_5 "PPB_Flash;12.5" |
#define PPB_FLASH_INTERFACE_12_6 "PPB_Flash;12.6" |
-#define PPB_FLASH_INTERFACE PPB_FLASH_INTERFACE_12_6 |
+#define PPB_FLASH_INTERFACE_13_0 "PPB_Flash;13.0" |
+#define PPB_FLASH_INTERFACE PPB_FLASH_INTERFACE_13_0 |
/** |
* @file |
@@ -129,7 +126,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_FlashCrashKey, 4); |
* The <code>PPB_Flash</code> interface contains pointers to various functions |
* that are only needed to support Pepper Flash. |
*/ |
-struct PPB_Flash_12_6 { |
+struct PPB_Flash_13_0 { |
/** |
* Sets or clears the rendering hint that the given plugin instance is always |
* on top of page content. Somewhat more optimized painting can be used in |
@@ -168,18 +165,6 @@ struct PPB_Flash_12_6 { |
const char* target, |
PP_Bool from_user_action); |
/** |
- * Runs a nested message loop. The plugin will be reentered from this call. |
- * This function is used in places where Flash would normally enter a nested |
- * message loop (e.g., when displaying context menus), but Pepper provides |
- * only an asynchronous call. After performing that asynchronous call, call |
- * |RunMessageLoop()|. In the callback, call |QuitMessageLoop()|. |
- */ |
- void (*RunMessageLoop)(PP_Instance instance); |
- /* Posts a quit message for the outermost nested message loop. Use this to |
- * exit and return back to the caller after you call RunMessageLoop. |
- */ |
- void (*QuitMessageLoop)(PP_Instance instance); |
- /** |
* Retrieves the local time zone offset from GM time for the given UTC time. |
*/ |
double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t); |
@@ -204,24 +189,11 @@ struct PPB_Flash_12_6 { |
*/ |
PP_Bool (*IsRectTopmost)(PP_Instance instance, const struct PP_Rect* rect); |
/** |
- * Does nothing, deprecated. See PPB_Flash_Print. |
- */ |
- int32_t (*InvokePrinting)(PP_Instance instance); |
- /** |
* Indicates that there's activity and, e.g., the screensaver shouldn't kick |
* in. |
*/ |
void (*UpdateActivity)(PP_Instance instance); |
/** |
- * Returns the device ID as a string. Returns a PP_VARTYPE_UNDEFINED on error. |
- * Deprecated, use GetDeviceIDAsync. |
- */ |
- struct PP_Var (*GetDeviceID)(PP_Instance instance); |
- /** |
- * Deprecated. See GetSetting(). |
- */ |
- int32_t (*GetSettingInt)(PP_Instance instance, PP_FlashSetting setting); |
- /** |
* Returns the value associated with the given setting. Invalid enums will |
* result in an undefined PP_Var return value. |
*/ |
@@ -251,88 +223,9 @@ struct PPB_Flash_12_6 { |
struct PP_ArrayOutput devices); |
}; |
-typedef struct PPB_Flash_12_6 PPB_Flash; |
- |
-struct PPB_Flash_12_0 { |
- void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top); |
- PP_Bool (*DrawGlyphs)(PP_Instance instance, |
- PP_Resource pp_image_data, |
- const struct PP_FontDescription_Dev* font_desc, |
- uint32_t color, |
- const struct PP_Point* position, |
- const struct PP_Rect* clip, |
- const float transformation[3][3], |
- PP_Bool allow_subpixel_aa, |
- uint32_t glyph_count, |
- const uint16_t glyph_indices[], |
- const struct PP_Point glyph_advances[]); |
- struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url); |
- int32_t (*Navigate)(PP_Resource request_info, |
- const char* target, |
- PP_Bool from_user_action); |
- void (*RunMessageLoop)(PP_Instance instance); |
- void (*QuitMessageLoop)(PP_Instance instance); |
- double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t); |
- struct PP_Var (*GetCommandLineArgs)(PP_Module module); |
- void (*PreloadFontWin)(const void* logfontw); |
-}; |
+typedef struct PPB_Flash_13_0 PPB_Flash; |
-struct PPB_Flash_12_1 { |
- void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top); |
- PP_Bool (*DrawGlyphs)(PP_Instance instance, |
- PP_Resource pp_image_data, |
- const struct PP_FontDescription_Dev* font_desc, |
- uint32_t color, |
- const struct PP_Point* position, |
- const struct PP_Rect* clip, |
- const float transformation[3][3], |
- PP_Bool allow_subpixel_aa, |
- uint32_t glyph_count, |
- const uint16_t glyph_indices[], |
- const struct PP_Point glyph_advances[]); |
- struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url); |
- int32_t (*Navigate)(PP_Resource request_info, |
- const char* target, |
- PP_Bool from_user_action); |
- void (*RunMessageLoop)(PP_Instance instance); |
- void (*QuitMessageLoop)(PP_Instance instance); |
- double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t); |
- struct PP_Var (*GetCommandLineArgs)(PP_Module module); |
- void (*PreloadFontWin)(const void* logfontw); |
- PP_Bool (*IsRectTopmost)(PP_Instance instance, const struct PP_Rect* rect); |
- int32_t (*InvokePrinting)(PP_Instance instance); |
- void (*UpdateActivity)(PP_Instance instance); |
-}; |
- |
-struct PPB_Flash_12_2 { |
- void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top); |
- PP_Bool (*DrawGlyphs)(PP_Instance instance, |
- PP_Resource pp_image_data, |
- const struct PP_FontDescription_Dev* font_desc, |
- uint32_t color, |
- const struct PP_Point* position, |
- const struct PP_Rect* clip, |
- const float transformation[3][3], |
- PP_Bool allow_subpixel_aa, |
- uint32_t glyph_count, |
- const uint16_t glyph_indices[], |
- const struct PP_Point glyph_advances[]); |
- struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url); |
- int32_t (*Navigate)(PP_Resource request_info, |
- const char* target, |
- PP_Bool from_user_action); |
- void (*RunMessageLoop)(PP_Instance instance); |
- void (*QuitMessageLoop)(PP_Instance instance); |
- double (*GetLocalTimeZoneOffset)(PP_Instance instance, PP_Time t); |
- struct PP_Var (*GetCommandLineArgs)(PP_Module module); |
- void (*PreloadFontWin)(const void* logfontw); |
- PP_Bool (*IsRectTopmost)(PP_Instance instance, const struct PP_Rect* rect); |
- int32_t (*InvokePrinting)(PP_Instance instance); |
- void (*UpdateActivity)(PP_Instance instance); |
- struct PP_Var (*GetDeviceID)(PP_Instance instance); |
-}; |
- |
-struct PPB_Flash_12_3 { |
+struct PPB_Flash_12_4 { |
void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top); |
PP_Bool (*DrawGlyphs)(PP_Instance instance, |
PP_Resource pp_image_data, |
@@ -359,9 +252,10 @@ struct PPB_Flash_12_3 { |
void (*UpdateActivity)(PP_Instance instance); |
struct PP_Var (*GetDeviceID)(PP_Instance instance); |
int32_t (*GetSettingInt)(PP_Instance instance, PP_FlashSetting setting); |
+ struct PP_Var (*GetSetting)(PP_Instance instance, PP_FlashSetting setting); |
}; |
-struct PPB_Flash_12_4 { |
+struct PPB_Flash_12_5 { |
void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top); |
PP_Bool (*DrawGlyphs)(PP_Instance instance, |
PP_Resource pp_image_data, |
@@ -389,9 +283,12 @@ struct PPB_Flash_12_4 { |
struct PP_Var (*GetDeviceID)(PP_Instance instance); |
int32_t (*GetSettingInt)(PP_Instance instance, PP_FlashSetting setting); |
struct PP_Var (*GetSetting)(PP_Instance instance, PP_FlashSetting setting); |
+ PP_Bool (*SetCrashData)(PP_Instance instance, |
+ PP_FlashCrashKey key, |
+ struct PP_Var value); |
}; |
-struct PPB_Flash_12_5 { |
+struct PPB_Flash_12_6 { |
void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top); |
PP_Bool (*DrawGlyphs)(PP_Instance instance, |
PP_Resource pp_image_data, |
@@ -422,6 +319,9 @@ struct PPB_Flash_12_5 { |
PP_Bool (*SetCrashData)(PP_Instance instance, |
PP_FlashCrashKey key, |
struct PP_Var value); |
+ int32_t (*EnumerateVideoCaptureDevices)(PP_Instance instance, |
+ PP_Resource video_capture, |
+ struct PP_ArrayOutput devices); |
}; |
/** |
* @} |