diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 05:32:04 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 05:32:04 +0000 |
| commit | a085aed793ce5577c7a0fca65e68447dd6d6f5ef (patch) | |
| tree | a0799313b93fe269db084e68b229dddfcc9b5614 /ppapi/proxy/interface_list.cc | |
| parent | f2202083f44fb378bc03e784c6a02e863e686b40 (diff) | |
| download | chromium_src-a085aed793ce5577c7a0fca65e68447dd6d6f5ef.zip chromium_src-a085aed793ce5577c7a0fca65e68447dd6d6f5ef.tar.gz chromium_src-a085aed793ce5577c7a0fca65e68447dd6d6f5ef.tar.bz2 | |
Convert the PPB_Flash interface to use the thunk system.
This was a bit tricky since some of the functions had no instance context, so I added global functions on the PpapiGlobals interface for them. It would be nice to add a PP_Instance argument and fix this in the future.
I did a new style of doing the thunking. The "function APIs" haven't really worked out since it's almost always easier to add the functions directly on the instance one. Since this is a larger and more separable chunk, I just added a getter on the instance API for the flash API and thunk through that. I'd like to convert the remaining ~3 function APIs to either call directly on the instance or use this method, but that's not addressed by this patch.
I moved the flash command line switch to plugin_switches so this could be hooked up properly. It allowed me to delete the delegate API for this.
I combined the flash fullscreen functions into the new Flash API which removed a bit of code.
Review URL: https://chromiumcodereview.appspot.com/10091003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/interface_list.cc')
| -rw-r--r-- | ppapi/proxy/interface_list.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc index 8d3fbcb..ed640da 100644 --- a/ppapi/proxy/interface_list.cc +++ b/ppapi/proxy/interface_list.cc @@ -176,6 +176,10 @@ InterfaceList::InterfaceList() { #include "ppapi/thunk/interfaces_ppb_private.h" #endif + #if !defined(OS_NACL) + #include "ppapi/thunk/interfaces_ppb_private_flash.h" + #endif + #undef PROXIED_API #undef PROXIED_IFACE @@ -301,16 +305,6 @@ const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const { #if !defined(OS_NACL) void InterfaceList::AddFlashInterfaces() { - AddProxy(API_ID_PPB_FLASH, &ProxyFactory<PPB_Flash_Proxy>); - AddPPB(PPB_FLASH_INTERFACE_11_0, API_ID_PPB_FLASH, - PPB_Flash_Proxy::GetInterface11()); - AddPPB(PPB_FLASH_INTERFACE_12_0, API_ID_PPB_FLASH, - PPB_Flash_Proxy::GetInterface12_0()); - AddPPB(PPB_FLASH_INTERFACE_12_1, API_ID_PPB_FLASH, - PPB_Flash_Proxy::GetInterface12_1()); - AddPPB(PPB_FLASH_INTERFACE_12_2, API_ID_PPB_FLASH, - PPB_Flash_Proxy::GetInterface12_2()); - AddProxy(API_ID_PPB_FLASH_CLIPBOARD, &ProxyFactory<PPB_Flash_Clipboard_Proxy>); AddPPB(PPB_FLASH_CLIPBOARD_INTERFACE_4_0, API_ID_PPB_FLASH_CLIPBOARD, |