Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(572)

Unified Diff: webkit/plugins/ppapi/plugin_module.cc

Issue 7292033: First pass at freezing stable pepper interfaces to 1.0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/thunk/thunk.h ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/plugin_module.cc
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 65d702df515612c0a3b0676f179f955ea1e4a30c..5c5eb38d7c32346408d098afba0d400a5374335f 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -232,9 +232,9 @@ const void* GetInterface(const char* name) {
// Please keep alphabetized by interface macro name with "special" stuff at
// the bottom.
- if (strcmp(name, PPB_AUDIO_CONFIG_INTERFACE) == 0)
+ if (strcmp(name, PPB_AUDIO_CONFIG_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_AudioConfig_Thunk();
- if (strcmp(name, PPB_AUDIO_INTERFACE) == 0)
+ if (strcmp(name, PPB_AUDIO_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_Audio_Thunk();
if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_AudioTrusted_Thunk();
@@ -258,13 +258,13 @@ const void* GetInterface(const char* name) {
return ::ppapi::thunk::GetPPB_DirectoryReader_Thunk();
if (strcmp(name, PPB_FILECHOOSER_DEV_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_FileChooser_Thunk();
- if (strcmp(name, PPB_FILEIO_INTERFACE) == 0)
+ if (strcmp(name, PPB_FILEIO_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_FileIO_Thunk();
if (strcmp(name, PPB_FILEIOTRUSTED_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_FileIOTrusted_Thunk();
- if (strcmp(name, PPB_FILEREF_INTERFACE) == 0)
+ if (strcmp(name, PPB_FILEREF_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_FileRef_Thunk();
- if (strcmp(name, PPB_FILESYSTEM_INTERFACE) == 0)
+ if (strcmp(name, PPB_FILESYSTEM_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_FileSystem_Thunk();
if (strcmp(name, PPB_FIND_DEV_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_Find_Thunk();
@@ -284,25 +284,23 @@ const void* GetInterface(const char* name) {
return ::ppapi::thunk::GetPPB_Font_Thunk();
if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_Fullscreen_Thunk();
- if (strcmp(name, PPB_GRAPHICS_2D_INTERFACE) == 0)
+ if (strcmp(name, PPB_GRAPHICS_2D_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_Graphics2D_Thunk();
- if (strcmp(name, PPB_IMAGEDATA_INTERFACE) == 0)
+ if (strcmp(name, PPB_IMAGEDATA_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_ImageData_Thunk();
if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk();
if (strcmp(name, PPB_INPUT_EVENT_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_InputEvent_Thunk();
- if (strcmp(name, PPB_INSTANCE_INTERFACE_0_4) == 0)
- return ::ppapi::thunk::GetPPB_Instance_0_4_Thunk();
- if (strcmp(name, PPB_INSTANCE_INTERFACE_0_5) == 0)
- return ::ppapi::thunk::GetPPB_Instance_0_5_Thunk();
+ if (strcmp(name, PPB_INSTANCE_INTERFACE_1_0) == 0)
+ return ::ppapi::thunk::GetPPB_Instance_1_0_Thunk();
if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_Instance_Private_Thunk();
if (strcmp(name, PPB_KEYBOARD_INPUT_EVENT_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_KeyboardInputEvent_Thunk();
if (strcmp(name, PPB_MEMORY_DEV_INTERFACE) == 0)
return PPB_Memory_Impl::GetInterface();
- if (strcmp(name, PPB_MESSAGING_INTERFACE) == 0)
+ if (strcmp(name, PPB_MESSAGING_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_Messaging_Thunk();
if (strcmp(name, PPB_MOUSE_INPUT_EVENT_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_MouseInputEvent_Thunk();
@@ -314,19 +312,19 @@ const void* GetInterface(const char* name) {
return PPB_Scrollbar_Impl::Get0_3Interface();
if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0)
return PPB_UMA_Private_Impl::GetInterface();
- if (strcmp(name, PPB_URLLOADER_INTERFACE) == 0)
+ if (strcmp(name, PPB_URLLOADER_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_URLLoader_Thunk();
if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_URLLoaderTrusted_Thunk();
- if (strcmp(name, PPB_URLREQUESTINFO_INTERFACE) == 0)
+ if (strcmp(name, PPB_URLREQUESTINFO_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_URLRequestInfo_Thunk();
- if (strcmp(name, PPB_URLRESPONSEINFO_INTERFACE) == 0)
+ if (strcmp(name, PPB_URLRESPONSEINFO_INTERFACE_1_0) == 0)
return ::ppapi::thunk::GetPPB_URLResponseInfo_Thunk();
if (strcmp(name, PPB_URLUTIL_DEV_INTERFACE) == 0)
return PPB_URLUtil_Impl::GetInterface();
if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0)
return Var::GetDeprecatedInterface();
- if (strcmp(name, PPB_VAR_INTERFACE) == 0)
+ if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0)
return Var::GetInterface();
if (strcmp(name, PPB_VIDEODECODER_DEV_INTERFACE) == 0)
return ::ppapi::thunk::GetPPB_VideoDecoder_Thunk();
@@ -369,6 +367,42 @@ const void* GetInterface(const char* name) {
return ::ppapi::thunk::GetPPB_Transport_Thunk();
#endif
+ // Support pre-1.0 version strings of stable interfaces until the changes
+ // have rippled through the system (especially NaCl tree).
+ // TODO(dmichael): Remove this.
+ if (strcmp(name, PPB_AUDIO_CONFIG_INTERFACE_0_5) == 0)
+ return ::ppapi::thunk::GetPPB_AudioConfig_Thunk();
+ if (strcmp(name, PPB_AUDIO_INTERFACE_0_6) == 0)
+ return ::ppapi::thunk::GetPPB_Audio_Thunk();
+ if (strcmp(name, PPB_FILEIO_INTERFACE_0_5) == 0)
+ return ::ppapi::thunk::GetPPB_FileIO_Thunk();
+ if (strcmp(name, PPB_FILEREF_INTERFACE_0_9) == 0)
+ return ::ppapi::thunk::GetPPB_FileRef_Thunk();
+ if (strcmp(name, PPB_FILESYSTEM_INTERFACE_0_7) == 0)
+ return ::ppapi::thunk::GetPPB_FileSystem_Thunk();
+ if (strcmp(name, PPB_GRAPHICS_2D_INTERFACE_0_4) == 0)
+ return PPB_Graphics2D_Impl::GetInterface();
+ if (strcmp(name, PPB_IMAGEDATA_INTERFACE_0_3) == 0)
+ return ::ppapi::thunk::GetPPB_ImageData_Thunk();
+ if (strcmp(name, PPB_INSTANCE_INTERFACE_0_5) == 0)
+ return ::ppapi::thunk::GetPPB_Instance_1_0_Thunk();
+ if (strcmp(name, PPB_MESSAGING_INTERFACE_0_1) == 0)
+ return ::ppapi::thunk::GetPPB_Messaging_Thunk();
+ if (strcmp(name, PPB_URLLOADER_INTERFACE_0_2) == 0)
+ return ::ppapi::thunk::GetPPB_URLLoader_Thunk();
+ if (strcmp(name, PPB_URLREQUESTINFO_INTERFACE_0_2) == 0)
+ return ::ppapi::thunk::GetPPB_URLRequestInfo_Thunk();
+ if (strcmp(name, PPB_URLRESPONSEINFO_INTERFACE_0_1) == 0)
+ return ::ppapi::thunk::GetPPB_URLResponseInfo_Thunk();
+ if (strcmp(name, PPB_VAR_INTERFACE_0_5) == 0)
+ return Var::GetInterface();
+
+ // Support the 0.4 version of PPB_Instance that includes scripting, until it
+ // is no longer being used.
+ // TODO(dmichael): Remove this.
+ if (strcmp(name, PPB_INSTANCE_INTERFACE_0_4) == 0)
+ return ::ppapi::thunk::GetPPB_Instance_0_4_Thunk();
+
// Support the dev interfaces for file io, fileref and file system
// until relevant tests and examples are migrated over to non-dev interfaces
// in order to prevent breaking the tests and examples.
« no previous file with comments | « ppapi/thunk/thunk.h ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698