summaryrefslogtreecommitdiffstats
path: root/ppapi/c
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 21:17:22 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 21:17:22 +0000
commit247e1bc809a02cdcb9a2eb272e8ccf253e61812c (patch)
treeed6f360a904587d054bcc8b4ab8c090233b9c076 /ppapi/c
parentb04cc6f45cf50d34dad447f94b18930e7884ec77 (diff)
downloadchromium_src-247e1bc809a02cdcb9a2eb272e8ccf253e61812c.zip
chromium_src-247e1bc809a02cdcb9a2eb272e8ccf253e61812c.tar.gz
chromium_src-247e1bc809a02cdcb9a2eb272e8ccf253e61812c.tar.bz2
Add a Flash API to get the device ID.
BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/9960083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/c')
-rw-r--r--ppapi/c/private/ppb_flash.h40
1 files changed, 36 insertions, 4 deletions
diff --git a/ppapi/c/private/ppb_flash.h b/ppapi/c/private/ppb_flash.h
index f91f07c..7564693 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 Fri Feb 17 15:52:14 2012. */
+/* From private/ppb_flash.idl modified Tue Apr 10 15:38:45 2012. */
#ifndef PPAPI_C_PRIVATE_PPB_FLASH_H_
#define PPAPI_C_PRIVATE_PPB_FLASH_H_
@@ -23,7 +23,8 @@
#define PPB_FLASH_INTERFACE_12_0 "PPB_Flash;12.0"
#define PPB_FLASH_INTERFACE_12_1 "PPB_Flash;12.1"
-#define PPB_FLASH_INTERFACE PPB_FLASH_INTERFACE_12_1
+#define PPB_FLASH_INTERFACE_12_2 "PPB_Flash;12.2"
+#define PPB_FLASH_INTERFACE PPB_FLASH_INTERFACE_12_2
/**
* @file
@@ -39,7 +40,7 @@
* The <code>PPB_Flash</code> interface contains pointers to various functions
* that are only needed to support Pepper Flash.
*/
-struct PPB_Flash_12_1 {
+struct PPB_Flash_12_2 {
/**
* 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
@@ -122,9 +123,13 @@ struct PPB_Flash_12_1 {
* in.
*/
void (*UpdateActivity)(PP_Instance instance);
+ /**
+ * Returns the device ID as a string. Returns a PP_VARTYPE_UNDEFINED on error.
+ */
+ struct PP_Var (*GetDeviceID)(PP_Instance instance);
};
-typedef struct PPB_Flash_12_1 PPB_Flash;
+typedef struct PPB_Flash_12_2 PPB_Flash;
struct PPB_Flash_12_0 {
void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);
@@ -149,6 +154,33 @@ struct PPB_Flash_12_0 {
struct PP_Var (*GetCommandLineArgs)(PP_Module module);
void (*PreloadFontWin)(const void* logfontw);
};
+
+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);
+};
/**
* @}
*/