Migrating PPB_FileIO_Dev, PPB_FileRef_Dev, and PPB_FileSystem_Dev dependencies to PPB_FileIO, PPB...

webkit/plugins/ppapi/plugin_module.cc

Index: webkit/plugins/ppapi/plugin_module.cc
===================================================================
--- webkit/plugins/ppapi/plugin_module.cc	(revision 91228)
+++ webkit/plugins/ppapi/plugin_module.cc	(working copy)
@@ -21,10 +21,6 @@
 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
 #include "ppapi/c/dev/ppb_directory_reader_dev.h"
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
-#include "ppapi/c/dev/ppb_file_io_dev.h"
-#include "ppapi/c/dev/ppb_file_io_trusted_dev.h"
-#include "ppapi/c/dev/ppb_file_ref_dev.h"
-#include "ppapi/c/dev/ppb_file_system_dev.h"
 #include "ppapi/c/dev/ppb_find_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/dev/ppb_fullscreen_dev.h"
@@ -48,6 +44,9 @@
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_core.h"
+#include "ppapi/c/ppb_file_io.h"
+#include "ppapi/c/ppb_file_ref.h"
+#include "ppapi/c/ppb_file_system.h"
 #include "ppapi/c/ppb_graphics_2d.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/c/ppb_instance.h"
@@ -68,6 +67,7 @@
 #include "ppapi/c/trusted/ppb_audio_trusted.h"
 #include "ppapi/c/trusted/ppb_broker_trusted.h"
 #include "ppapi/c/trusted/ppb_buffer_trusted.h"
+#include "ppapi/c/trusted/ppb_file_io_trusted.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "ppapi/thunk/enter.h"
@@ -253,14 +253,30 @@
     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_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_FILEIO_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_FileIO_Thunk();
-  if (strcmp(name, PPB_FILEIOTRUSTED_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_FILEIOTRUSTED_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_FileIOTrusted_Thunk();
-  if (strcmp(name, PPB_FILEREF_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_FILEREF_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_FileRef_Thunk();
-  if (strcmp(name, PPB_FILESYSTEM_DEV_INTERFACE) == 0)
+  if (strcmp(name, PPB_FILESYSTEM_INTERFACE) == 0)
     return ::ppapi::thunk::GetPPB_FileSystem_Thunk();
+  // Support the dev interfaces for file io, fileref and file system

[brettw, 2011/07/06 16:00:34]

Can you put this condition below with the GL stuff so all the "regular"
interfaces are in one block?

[sanga, 2011/07/06 16:18:59]

Done.

+  // 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.3") == 0)

[brettw, 2011/07/06 16:00:34]

There are no defines for the dev version, the define points to the new non-dev
version.

+      return ::ppapi::thunk::GetPPB_FileIO_Thunk();
+    if (strcmp(name, "PPB_FileIOTrusted(Dev);0.2") == 0)
+      return ::ppapi::thunk::GetPPB_FileIOTrusted_Thunk();
+    if (strcmp(name, "PPB_FileRef(Dev);0.7") == 0)
+      return ::ppapi::thunk::GetPPB_FileRef_Thunk();
+    if (strcmp(name, "PPB_FileSystem(Dev);0.5") == 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)
@@ -559,7 +575,7 @@
   broker_ = broker;
 }
 
-PluginDelegate::PpapiBroker* PluginModule::GetBroker(){
+PluginDelegate::PpapiBroker* PluginModule::GetBroker() {
   return broker_;
 }