summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/ppapi/plugin_module.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-01 05:51:27 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-01 05:51:27 +0000
commit4697f72f5bdb2ead8aa9051b47fb0fade5acd1f5 (patch)
tree4b27e9a2b6f932059c57c20aed2f4841f5a15d0a /webkit/plugins/ppapi/plugin_module.cc
parent2f89b6045896d8e8efc3984da72c3bf4c63d6e0f (diff)
downloadchromium_src-4697f72f5bdb2ead8aa9051b47fb0fade5acd1f5.zip
chromium_src-4697f72f5bdb2ead8aa9051b47fb0fade5acd1f5.tar.gz
chromium_src-4697f72f5bdb2ead8aa9051b47fb0fade5acd1f5.tar.bz2
Revert 87415 - Convert more interfaces to the new thunk system. This goes up to and including
the ones starting with "F". Since this adds a lot more interfaces, I added the macro stuff we used for the old system to generate the various template specializations. This involded a lot of renaming since the As* needs to match the name (I was previously leaving off the "PPB_" part). I did other misc cleanup to the infrastructure. Review URL: http://codereview.chromium.org/7082036 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/7006022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/plugin_module.cc')
-rw-r--r--webkit/plugins/ppapi/plugin_module.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 0f16cc1..7d5bb74 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -270,21 +270,21 @@ const void* GetInterface(const char* name) {
if (strcmp(name, PPB_CURSOR_CONTROL_DEV_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_CursorControl_Thunk();
if (strcmp(name, PPB_DIRECTORYREADER_DEV_INTERFACE) == 0)
- return ::ppapi::thunk::GetPPB_DirectoryReader_Thunk();
+ return PPB_DirectoryReader_Impl::GetInterface();
if (strcmp(name, PPB_FILECHOOSER_DEV_INTERFACE) == 0)
- return ::ppapi::thunk::GetPPB_FileChooser_Thunk();
+ return PPB_FileChooser_Impl::GetInterface();
if (strcmp(name, PPB_FILEIO_DEV_INTERFACE) == 0)
- return ::ppapi::thunk::GetPPB_FileIO_Thunk();
+ return PPB_FileIO_Impl::GetInterface();
if (strcmp(name, PPB_NACL_PRIVATE_INTERFACE) == 0)
return PPB_NaCl_Private_Impl::GetInterface();
if (strcmp(name, PPB_FILEIOTRUSTED_DEV_INTERFACE) == 0)
- return ::ppapi::thunk::GetPPB_FileIOTrusted_Thunk();
+ return PPB_FileIO_Impl::GetTrustedInterface();
if (strcmp(name, PPB_FILEREF_DEV_INTERFACE) == 0)
- return ::ppapi::thunk::GetPPB_FileRef_Thunk();
+ return PPB_FileRef_Impl::GetInterface();
if (strcmp(name, PPB_FILESYSTEM_DEV_INTERFACE) == 0)
- return ::ppapi::thunk::GetPPB_FileSystem_Thunk();
+ return PPB_FileSystem_Impl::GetInterface();
if (strcmp(name, PPB_FIND_DEV_INTERFACE) == 0)
- return ::ppapi::thunk::GetPPB_Find_Thunk();
+ return PluginInstance::GetFindInterface();
if (strcmp(name, PPB_FLASH_INTERFACE) == 0)
return PPB_Flash_Impl::GetInterface();
if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE) == 0)