Revert 92302 - First pass at revving stable pepper interfaces to 1.0.

webkit/plugins/ppapi/plugin_module.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/plugin_module.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 214 matching lines @@
   DCHECK(IsMainThread());
 
   // Allow custom interface factories first stab at the GetInterface call.
   const void* custom_interface =
       PpapiInterfaceFactoryManager::GetInstance()->GetInterface(name);
   if (custom_interface)
     return custom_interface;
 
   // Please keep alphabetized by interface macro name with "special" stuff at
   // the bottom.
-  if (strcmp(name, PPB_AUDIO_CONFIG_INTERFACE_1_0) == 0)
+  if (strcmp(name, PPB_AUDIO_CONFIG_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_AudioConfig_Thunk();
-  if (strcmp(name, PPB_AUDIO_INTERFACE_1_0) == 0)
+  if (strcmp(name, PPB_AUDIO_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Audio_Thunk();
   if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_AudioTrusted_Thunk();
   if (strcmp(name, PPB_BROKER_TRUSTED_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Broker_Thunk();
   if (strcmp(name, PPB_BUFFER_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Buffer_Thunk();
   if (strcmp(name, PPB_BUFFER_TRUSTED_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_BufferTrusted_Thunk();
   if (strcmp(name, PPB_CHAR_SET_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_CharSet_Thunk();
   if (strcmp(name, PPB_CONSOLE_DEV_INTERFACE) == 0)
     return PPB_Console_Impl::GetInterface();
   if (strcmp(name, PPB_CORE_INTERFACE) == 0)
     return &core_interface;
   if (strcmp(name, PPB_CRYPTO_DEV_INTERFACE) == 0)
     return PPB_Crypto_Impl::GetInterface();
   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();
   if (strcmp(name, PPB_FILECHOOSER_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_FileChooser_Thunk();
-  if (strcmp(name, PPB_FILEIO_INTERFACE_1_0) == 0)
+  if (strcmp(name, PPB_FILEIO_INTERFACE) == 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_1_0) == 0)
+  if (strcmp(name, PPB_FILEREF_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_FileRef_Thunk();
-  if (strcmp(name, PPB_FILESYSTEM_INTERFACE_1_0) == 0)
+  if (strcmp(name, PPB_FILESYSTEM_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_FileSystem_Thunk();
   if (strcmp(name, PPB_FIND_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Find_Thunk();
   if (strcmp(name, PPB_FLASH_INTERFACE) == 0)
     return PPB_Flash_Impl::GetInterface();
   if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE) == 0)
     return PPB_Flash_Clipboard_Impl::GetInterface();
   if (strcmp(name, PPB_FLASH_FILE_FILEREF_INTERFACE) == 0)
     return PPB_Flash_File_FileRef_Impl::GetInterface();
   if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0)
     return PPB_Flash_File_ModuleLocal_Impl::GetInterface();
   if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk();
   if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Flash_TCPSocket_Thunk();
   if (strcmp(name, PPB_FONT_DEV_INTERFACE) == 0)
     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_1_0) == 0)
+  if (strcmp(name, PPB_GRAPHICS_2D_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Graphics2D_Thunk();
-  if (strcmp(name, PPB_IMAGEDATA_INTERFACE_1_0) == 0)
+  if (strcmp(name, PPB_IMAGEDATA_INTERFACE) == 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_1_0) == 0)
-    return ::ppapi::thunk::GetPPB_Instance_1_0_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_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_1_0) == 0)
+  if (strcmp(name, PPB_MESSAGING_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Messaging_Thunk();
   if (strcmp(name, PPB_MOUSE_INPUT_EVENT_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_MouseInputEvent_Thunk();
   if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0)
     return PPB_Proxy_Impl::GetInterface();
   if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE_0_4) == 0)
     return ::ppapi::thunk::GetPPB_Scrollbar_Thunk();
   if (strcmp(name, PPB_SCROLLBAR_DEV_INTERFACE_0_3) == 0)
     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_1_0) == 0)
+  if (strcmp(name, PPB_URLLOADER_INTERFACE) == 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_1_0) == 0)
+  if (strcmp(name, PPB_URLREQUESTINFO_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_URLRequestInfo_Thunk();
-  if (strcmp(name, PPB_URLRESPONSEINFO_INTERFACE_1_0) == 0)
+  if (strcmp(name, PPB_URLRESPONSEINFO_INTERFACE) == 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_1_0) == 0)
+  if (strcmp(name, PPB_VAR_INTERFACE) == 0)
     return Var::GetInterface();
   if (strcmp(name, PPB_VIDEODECODER_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_VideoDecoder_Thunk();
   if (strcmp(name, PPB_VIDEOLAYER_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_VideoLayer_Thunk();
   if (strcmp(name, PPB_WHEEL_INPUT_EVENT_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_WheelInputEvent_Thunk();
   if (strcmp(name, PPB_WIDGET_DEV_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Widget_Thunk();
   if (strcmp(name, PPB_ZOOM_DEV_INTERFACE) == 0)
@@ skipping 22 matching lines @@
 #ifdef ENABLE_FLAPPER_HACKS
   if (strcmp(name, PPB_FLASH_NETCONNECTOR_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_Flash_NetConnector_Thunk();
 #endif  // ENABLE_FLAPPER_HACKS
 
 #if defined(ENABLE_P2P_APIS)
   if (strcmp(name, PPB_TRANSPORT_DEV_INTERFACE) == 0)
     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.
   // TODO(sanga): Remove support for these dev interfaces once the relevant
   // tests and examples are migrated to non-dev interfaces.
   const bool support_dev_file_interfaces = true;
   if (support_dev_file_interfaces) {
     if (strcmp(name, "PPB_FileIO(Dev);0.4") == 0)
       return ::ppapi::thunk::GetPPB_FileIO_Thunk();
     if (strcmp(name, "PPB_FileIOTrusted(Dev);0.3") == 0)
@@ skipping 233 matching lines @@
   int retval = entry_points.initialize_module(pp_module(), &GetInterface);
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit