Chromium Code Reviews| Index: ppapi/thunk/ppb_flash_thunk.cc |
| diff --git a/ppapi/thunk/ppb_flash_thunk.cc b/ppapi/thunk/ppb_flash_thunk.cc |
| index 85ca39372cbe605bdd74584de0a839fc4b87777a..bc985707b1628b755fd18f9616be5d7960c84399 100644 |
| --- a/ppapi/thunk/ppb_flash_thunk.cc |
| +++ b/ppapi/thunk/ppb_flash_thunk.cc |
| @@ -9,9 +9,12 @@ |
| #include "ppapi/shared_impl/var.h" |
| #include "ppapi/thunk/enter.h" |
| #include "ppapi/thunk/ppb_flash_api.h" |
| +#include "ppapi/thunk/ppb_flash_functions_api.h" |
| #include "ppapi/thunk/ppb_instance_api.h" |
| #include "ppapi/thunk/thunk.h" |
| +struct PP_ArrayOutput; |
|
yzshen1
2012/10/05 18:16:46
If the includes above doesn't have a definition of
raymes
2012/10/08 17:08:50
Done.
|
| + |
| namespace ppapi { |
| namespace thunk { |
| @@ -153,6 +156,23 @@ PP_Bool SetCrashData(PP_Instance instance, |
| return enter.functions()->GetFlashAPI()->SetCrashData(instance, key, value); |
| } |
| +int32_t EnumerateVideoDevicesSync(PP_Instance instance, |
| + PP_Resource video_capture, |
| + PP_ArrayOutput devices) { |
| + EnterInstance enter(instance); |
| + if (enter.succeeded()) { |
| + PPB_Flash_Functions_API* api = |
| + enter.functions()->GetFlashFunctionsAPI(instance); |
| + if (api) { |
| + return api->EnumerateVideoDevicesSync(instance, video_capture, |
| + devices); |
| + } else { |
| + return PP_ERROR_NOINTERFACE; |
| + } |
| + } |
| + return PP_ERROR_BADRESOURCE; |
|
yzshen1
2012/10/05 18:16:46
The comment of this new method doesn't mentioned a
raymes
2012/10/08 17:08:50
Done.
|
| +} |
| + |
| const PPB_Flash_12_0 g_ppb_flash_12_0_thunk = { |
| &SetInstanceAlwaysOnTop, |
| &DrawGlyphs, |
| @@ -250,6 +270,26 @@ const PPB_Flash_12_5 g_ppb_flash_12_5_thunk = { |
| &SetCrashData |
| }; |
| +const PPB_Flash_12_6 g_ppb_flash_12_6_thunk = { |
| + &SetInstanceAlwaysOnTop, |
| + &DrawGlyphs, |
| + &GetProxyForURL, |
| + &Navigate, |
| + &RunMessageLoop, |
| + &QuitMessageLoop, |
| + &GetLocalTimeZoneOffset, |
| + &GetCommandLineArgs, |
| + &PreLoadFontWin, |
| + &IsRectTopmost, |
| + &InvokePrinting, |
| + &UpdateActivity, |
| + &GetDeviceID, |
| + &GetSettingInt, |
| + &GetSetting, |
| + &SetCrashData, |
| + &EnumerateVideoDevicesSync |
| +}; |
| + |
| } // namespace |
| const PPB_Flash_12_0* GetPPB_Flash_12_0_Thunk() { |
| @@ -276,5 +316,9 @@ const PPB_Flash_12_5* GetPPB_Flash_12_5_Thunk() { |
| return &g_ppb_flash_12_5_thunk; |
| } |
| +const PPB_Flash_12_6* GetPPB_Flash_12_6_Thunk() { |
| + return &g_ppb_flash_12_6_thunk; |
| +} |
| + |
| } // namespace thunk |
| } // namespace ppapi |