diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 21:37:30 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 21:37:30 +0000 |
| commit | f08e0c7847e42b5560386a80ae9b9729b1d497c3 (patch) | |
| tree | 23088eb648a2f08c7337dfec6276260dea945cbc /ppapi/thunk | |
| parent | 9cd9d63ab72bc24f72854b3d4035d10f82073861 (diff) | |
| download | chromium_src-f08e0c7847e42b5560386a80ae9b9729b1d497c3.zip chromium_src-f08e0c7847e42b5560386a80ae9b9729b1d497c3.tar.gz chromium_src-f08e0c7847e42b5560386a80ae9b9729b1d497c3.tar.bz2 | |
Add AllowSuddenTermination to API. This provide means for plugins to let us know those windows where they need a renderer at shutdown to finish saving state.
Updated flash api version to 12.4.
BUG=https://code.google.com/p/flapper/issues/detail?id=120
Review URL: https://chromiumcodereview.appspot.com/10302021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_private_flash.h | 3 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_flash_api.h | 2 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_flash_thunk.cc | 28 |
3 files changed, 33 insertions, 0 deletions
diff --git a/ppapi/thunk/interfaces_ppb_private_flash.h b/ppapi/thunk/interfaces_ppb_private_flash.h index e36f502..fa8842a 100644 --- a/ppapi/thunk/interfaces_ppb_private_flash.h +++ b/ppapi/thunk/interfaces_ppb_private_flash.h @@ -20,6 +20,9 @@ PROXIED_IFACE(PPB_Flash, PROXIED_IFACE(PPB_Flash, PPB_FLASH_INTERFACE_12_3, PPB_Flash_12_3) +PROXIED_IFACE(PPB_Flash, + PPB_FLASH_INTERFACE_12_4, + PPB_Flash_12_4) PROXIED_IFACE(PPB_Flash, PPB_FLASH_CLIPBOARD_INTERFACE_3_LEGACY, diff --git a/ppapi/thunk/ppb_flash_api.h b/ppapi/thunk/ppb_flash_api.h index 3e1bf56..8483cab1 100644 --- a/ppapi/thunk/ppb_flash_api.h +++ b/ppapi/thunk/ppb_flash_api.h @@ -45,6 +45,8 @@ class PPAPI_THUNK_EXPORT PPB_Flash_API { virtual PP_Var GetDeviceID(PP_Instance instance) = 0; virtual int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting) = 0; + virtual void SetAllowSuddenTermination(PP_Instance instance, + PP_Bool allowed) = 0; // FlashClipboard. virtual PP_Bool IsClipboardFormatAvailable( diff --git a/ppapi/thunk/ppb_flash_thunk.cc b/ppapi/thunk/ppb_flash_thunk.cc index 4e004fb..c342803 100644 --- a/ppapi/thunk/ppb_flash_thunk.cc +++ b/ppapi/thunk/ppb_flash_thunk.cc @@ -139,6 +139,14 @@ int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting) { return enter.functions()->GetFlashAPI()->GetSettingInt(instance, setting); } +void SetAllowSuddenTermination(PP_Instance instance, PP_Bool allowed) { + EnterInstance enter(instance); + if (enter.succeeded()) { + enter.functions()->GetFlashAPI()->SetAllowSuddenTermination(instance, + allowed); + } +} + const PPB_Flash_12_0 g_ppb_flash_12_0_thunk = { &SetInstanceAlwaysOnTop, &DrawGlyphs, @@ -199,6 +207,23 @@ const PPB_Flash_12_3 g_ppb_flash_12_3_thunk = { &GetSettingInt }; +const PPB_Flash_12_4 g_ppb_flash_12_4_thunk = { + &SetInstanceAlwaysOnTop, + &DrawGlyphs, + &GetProxyForURL, + &Navigate, + &RunMessageLoop, + &QuitMessageLoop, + &GetLocalTimeZoneOffset, + &GetCommandLineArgs, + &PreLoadFontWin, + &IsRectTopmost, + &InvokePrinting, + &UpdateActivity, + &GetDeviceID, + &GetSettingInt, + &SetAllowSuddenTermination +}; } // namespace const PPB_Flash_12_0* GetPPB_Flash_12_0_Thunk() { @@ -217,5 +242,8 @@ const PPB_Flash_12_3* GetPPB_Flash_12_3_Thunk() { return &g_ppb_flash_12_3_thunk; } +const PPB_Flash_12_4* GetPPB_Flash_12_4_Thunk() { + return &g_ppb_flash_12_4_thunk; +} } // namespace thunk } // namespace ppapi |