Implement plugin side of sync EnumerateVideoCaptureDevices

ppapi/c/private/ppb_flash.h

Index: ppapi/c/private/ppb_flash.h
diff --git a/ppapi/c/private/ppb_flash.h b/ppapi/c/private/ppb_flash.h
index de2ccb1a5897ffaba7759c03426064159f8545e0..0279556524ec0ffc53a7047eae1aa1ca62b7a239 100644
--- a/ppapi/c/private/ppb_flash.h
+++ b/ppapi/c/private/ppb_flash.h
@@ -3,12 +3,13 @@
  * found in the LICENSE file.
  */
 
-/* From private/ppb_flash.idl modified Mon Jul 30 22:15:54 2012. */
+/* From private/ppb_flash.idl modified Mon Oct  8 13:03:27 2012. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_FLASH_H_
 #define PPAPI_C_PRIVATE_PPB_FLASH_H_
 
 #include "ppapi/c/dev/ppb_font_dev.h"
+#include "ppapi/c/pp_array_output.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_macros.h"
@@ -27,7 +28,8 @@
 #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 PPB_FLASH_INTERFACE_12_5
+#define PPB_FLASH_INTERFACE_12_6 "PPB_Flash;12.6"
+#define PPB_FLASH_INTERFACE PPB_FLASH_INTERFACE_12_6
 
 /**
  * @file
@@ -127,7 +129,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_5 {
+struct PPB_Flash_12_6 {
   /**
    * 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
@@ -231,9 +233,25 @@ struct PPB_Flash_12_5 {
   PP_Bool (*SetCrashData)(PP_Instance instance,
                           PP_FlashCrashKey key,
                           struct PP_Var value);
+  /**
+   * Enumerates video capture devices. |video_capture| is a valid
+   * PPB_VideoCapture_Dev resource. Once the operation has completed
+   * successfully, |devices| will be set up with an array of
+   * PPB_DeviceRef_Dev resources.
+   *
+   * PP_OK is returned on success and different pepper error code on failure.
+   * The ref count of the returned |devices| has already been increased by 1 for
+   * the caller.
+   *
+   * NOTE: This method is a synchronous version of |EnumerateDevices| in
+   * PPB_VideoCapture_Dev.
+   */
+  int32_t (*EnumerateVideoCaptureDevices)(PP_Instance instance,
+                                          PP_Resource video_capture,
+                                          struct PP_ArrayOutput devices);
 };
 
-typedef struct PPB_Flash_12_5 PPB_Flash;
+typedef struct PPB_Flash_12_6 PPB_Flash;
 
 struct PPB_Flash_12_0 {
   void (*SetInstanceAlwaysOnTop)(PP_Instance instance, PP_Bool on_top);
@@ -372,6 +390,39 @@ struct PPB_Flash_12_4 {
   int32_t (*GetSettingInt)(PP_Instance instance, PP_FlashSetting setting);
   struct PP_Var (*GetSetting)(PP_Instance instance, PP_FlashSetting setting);
 };
+
+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,
+                        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);
+  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);
+};
 /**
  * @}
  */