diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 16:19:41 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-30 16:19:41 +0000 |
| commit | 724fbd317ae5ee1a22add1e0013cb3c08dfe6155 (patch) | |
| tree | b8815bd91f10026f2558924185ac04935138ad4b /ppapi/shared_impl | |
| parent | e5bbe3d1366b0fda6d68aac22f904fd72f521b59 (diff) | |
| download | chromium_src-724fbd317ae5ee1a22add1e0013cb3c08dfe6155.zip chromium_src-724fbd317ae5ee1a22add1e0013cb3c08dfe6155.tar.gz chromium_src-724fbd317ae5ee1a22add1e0013cb3c08dfe6155.tar.bz2 | |
Move the rest of the Flash functions to the thunk system.
This removes the manual Flash interface registration and adds them via the
interfaces_ppb_private_flash.h header. I moved File_ModulalLocal and
File_FileRef to the Flash API virtual interface which allowed me to delete
the separate proxies and stuff associated with those interfaces.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10169040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/shared_impl')
| -rw-r--r-- | ppapi/shared_impl/api_id.h | 2 | ||||
| -rw-r--r-- | ppapi/shared_impl/ppb_flash_shared.cc | 8 | ||||
| -rw-r--r-- | ppapi/shared_impl/ppb_flash_shared.h | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ppapi/shared_impl/api_id.h b/ppapi/shared_impl/api_id.h index be4be56..d83c085 100644 --- a/ppapi/shared_impl/api_id.h +++ b/ppapi/shared_impl/api_id.h @@ -25,8 +25,6 @@ enum ApiID { API_ID_PPB_FILE_REF, API_ID_PPB_FILE_SYSTEM, API_ID_PPB_FLASH, - API_ID_PPB_FLASH_FILE_FILEREF, - API_ID_PPB_FLASH_FILE_MODULELOCAL, API_ID_PPB_FLASH_MENU, API_ID_PPB_FLASH_MESSAGELOOP, API_ID_PPB_FONT, diff --git a/ppapi/shared_impl/ppb_flash_shared.cc b/ppapi/shared_impl/ppb_flash_shared.cc index c0504bf..e78392c 100644 --- a/ppapi/shared_impl/ppb_flash_shared.cc +++ b/ppapi/shared_impl/ppb_flash_shared.cc @@ -12,6 +12,14 @@ PPB_Flash_Shared::PPB_Flash_Shared() { PPB_Flash_Shared::~PPB_Flash_Shared() { } +void PPB_Flash_Shared::FreeDirContents(PP_Instance instance, + PP_DirContents_Dev* contents) { + for (int32_t i = 0; i < contents->count; ++i) + delete[] contents->entries[i].name; + delete[] contents->entries; + delete contents; +} + // static bool PPB_Flash_Shared::IsValidClipboardType( PP_Flash_Clipboard_Type clipboard_type) { diff --git a/ppapi/shared_impl/ppb_flash_shared.h b/ppapi/shared_impl/ppb_flash_shared.h index b7de3bd..dfd209d 100644 --- a/ppapi/shared_impl/ppb_flash_shared.h +++ b/ppapi/shared_impl/ppb_flash_shared.h @@ -17,6 +17,10 @@ class PPAPI_SHARED_EXPORT PPB_Flash_Shared : public thunk::PPB_Flash_API { PPB_Flash_Shared(); virtual ~PPB_Flash_Shared(); + // Shared implementation of PPB_Flash_API. + virtual void FreeDirContents(PP_Instance instance, + PP_DirContents_Dev* contents) OVERRIDE; + protected: static bool IsValidClipboardType(PP_Flash_Clipboard_Type clipboard_type); static bool IsValidClipboardFormat(PP_Flash_Clipboard_Format format); |