Revert 247473 "PPAPI: Implement PPB_FileMapping on POSIX"

> PPAPI: Implement PPB_FileMapping on POSIX > > BUG=83774 > R=bbudge@chromium.org > > Review URL: https://codereview.chromium.org/69663002 TBR=dmichael@chromium.org Review URL: https://codereview.chromium.org/144383006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247477 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · Jan 28, 2014 · dd565bb · dd565bb
1 parent 7c900e3
commit dd565bb
Show file tree

Hide file tree

Showing 26 changed files with 13 additions and 1,111 deletions.
diff --git a/chrome/browser/component_updater/ppapi_utils.cc b/chrome/browser/component_updater/ppapi_utils.cc
@@ -41,7 +41,6 @@
 #include "ppapi/c/ppb_console.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_file_io.h"
-#include "ppapi/c/ppb_file_mapping.h"
 #include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/c/ppb_file_system.h"
 #include "ppapi/c/ppb_fullscreen.h"

diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
@@ -971,16 +971,6 @@ IN_PROC_BROWSER_TEST_F(PPAPIPrivateNaClPNaClTest, MAYBE_PNaCl_FileIO_Private) {
   );
 }
 
-// PPB_FileMapping is only implemented on POSIX currently.
-// http://crbug.com/83774
-#if defined(OS_WIN)
-#define MAYBE_FileMapping DISABLED_FileMapping
-#else
-#define MAYBE_FileMapping FileMapping
-#endif
-TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(MAYBE_FileMapping)
-TEST_PPAPI_NACL(MAYBE_FileMapping)
-
 // Note, the FileRef tests are split into two, because all of them together
 // sometimes take too long on windows: crbug.com/336999
 IN_PROC_BROWSER_TEST_F(PPAPITest, FileRef1) {

diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -2402,7 +2402,6 @@ ppapi::Resource* PepperPluginInstanceImpl::GetSingletonResource(
     case ppapi::BROKER_SINGLETON_ID:
     case ppapi::BROWSER_FONT_SINGLETON_ID:
     case ppapi::EXTENSIONS_COMMON_SINGLETON_ID:
-    case ppapi::FILE_MAPPING_SINGLETON_ID:
     case ppapi::FLASH_CLIPBOARD_SINGLETON_ID:
     case ppapi::FLASH_FILE_SINGLETON_ID:
     case ppapi::FLASH_FULLSCREEN_SINGLETON_ID:

diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc
@@ -66,7 +66,6 @@
 #include "ppapi/c/ppb_console.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_file_io.h"
-#include "ppapi/c/ppb_file_mapping.h"
 #include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/c/ppb_file_system.h"
 #include "ppapi/c/ppb_fullscreen.h"

diff --git a/ppapi/api/ppb_file_mapping.idl b/ppapi/api/ppb_file_mapping.idl
@@ -9,8 +9,6 @@
  * memory.
  */
 
-[generate_thunk]
-
 label Chrome {
   [channel=dev] M34 = 0.1
 };

diff --git a/ppapi/c/ppb_file_mapping.h b/ppapi/c/ppb_file_mapping.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From ppb_file_mapping.idl modified Mon Jan 27 11:00:43 2014. */
+/* From ppb_file_mapping.idl modified Wed Jan 22 12:25:44 2014. */
 
 #ifndef PPAPI_C_PPB_FILE_MAPPING_H_
 #define PPAPI_C_PPB_FILE_MAPPING_H_

diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
@@ -421,14 +421,14 @@ static int32_t Pnacl_M34_PPB_FileMapping_Map(PP_Instance instance, PP_Resource f
   return iface->Map(instance, file_io, length, map_protection, map_flags, offset, address, *callback);
 }
 
-static int32_t Pnacl_M34_PPB_FileMapping_Unmap(PP_Instance instance, const void* address, int64_t length, struct PP_CompletionCallback* callback) {
+static int32_t Pnacl_M34_PPB_FileMapping_Unmap(PP_Instance file_io, const void* address, int64_t length, struct PP_CompletionCallback* callback) {
   const struct PPB_FileMapping_0_1 *iface = Pnacl_WrapperInfo_PPB_FileMapping_0_1.real_iface;
-  return iface->Unmap(instance, address, length, *callback);
+  return iface->Unmap(file_io, address, length, *callback);
 }
 
-static int64_t Pnacl_M34_PPB_FileMapping_GetMapPageSize(PP_Instance instance) {
+static int64_t Pnacl_M34_PPB_FileMapping_GetMapPageSize(PP_Instance file_io) {
   const struct PPB_FileMapping_0_1 *iface = Pnacl_WrapperInfo_PPB_FileMapping_0_1.real_iface;
-  return iface->GetMapPageSize(instance);
+  return iface->GetMapPageSize(file_io);
 }
 
 /* End wrapper methods for PPB_FileMapping_0_1 */
@@ -4231,8 +4231,8 @@ static struct PPB_FileIO_1_1 Pnacl_Wrappers_PPB_FileIO_1_1 = {
 
 static struct PPB_FileMapping_0_1 Pnacl_Wrappers_PPB_FileMapping_0_1 = {
     .Map = (int32_t (*)(PP_Instance instance, PP_Resource file_io, int64_t length, uint32_t map_protection, uint32_t map_flags, int64_t offset, void** address, struct PP_CompletionCallback callback))&Pnacl_M34_PPB_FileMapping_Map,
-    .Unmap = (int32_t (*)(PP_Instance instance, const void* address, int64_t length, struct PP_CompletionCallback callback))&Pnacl_M34_PPB_FileMapping_Unmap,
-    .GetMapPageSize = (int64_t (*)(PP_Instance instance))&Pnacl_M34_PPB_FileMapping_GetMapPageSize
+    .Unmap = (int32_t (*)(PP_Instance file_io, const void* address, int64_t length, struct PP_CompletionCallback callback))&Pnacl_M34_PPB_FileMapping_Unmap,
+    .GetMapPageSize = (int64_t (*)(PP_Instance file_io))&Pnacl_M34_PPB_FileMapping_GetMapPageSize
 };
 
 static struct PPB_FileRef_1_0 Pnacl_Wrappers_PPB_FileRef_1_0 = {

diff --git a/ppapi/ppapi_proxy.gypi b/ppapi/ppapi_proxy.gypi
@@ -39,16 +39,8 @@
           'proxy/extensions_common_resource.h',
           'proxy/file_chooser_resource.cc',
           'proxy/file_chooser_resource.h',
-          'proxy/file_io_resource.cc',
-          'proxy/file_io_resource.h',
-          'proxy/file_mapping_resource.cc',
-          'proxy/file_mapping_resource.h',
-          'proxy/file_mapping_resource_posix.cc',
-          'proxy/file_mapping_resource_win.cc',
           'proxy/file_ref_resource.cc',
           'proxy/file_ref_resource.h',
-          'proxy/file_system_resource.cc',
-          'proxy/file_system_resource.h',
           'proxy/flash_clipboard_resource.cc',
           'proxy/flash_clipboard_resource.h',
           'proxy/flash_drm_resource.cc',
@@ -63,6 +55,10 @@
           'proxy/flash_menu_resource.h',
           'proxy/flash_resource.cc',
           'proxy/flash_resource.h',
+          'proxy/file_io_resource.cc',
+          'proxy/file_io_resource.h',
+          'proxy/file_system_resource.cc',
+          'proxy/file_system_resource.h',
           'proxy/gamepad_resource.cc',
           'proxy/gamepad_resource.h',
           'proxy/graphics_2d_resource.cc',

diff --git a/ppapi/ppapi_shared.gypi b/ppapi/ppapi_shared.gypi
@@ -163,7 +163,6 @@
           'thunk/ppb_file_io_api.h',
           'thunk/ppb_file_io_private_thunk.cc',
           'thunk/ppb_file_io_thunk.cc',
-          'thunk/ppb_file_mapping_thunk.cc',
           'thunk/ppb_file_ref_api.h',
           'thunk/ppb_file_ref_thunk.cc',
           'thunk/ppb_file_system_api.h',

diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi
@@ -30,7 +30,6 @@
       'c/ppb_console.h',
       'c/ppb_core.h',
       'c/ppb_file_io.h',
-      'c/ppb_file_mapping.h',
       'c/ppb_file_ref.h',
       'c/ppb_file_system.h',
       'c/ppb_fullscreen.h',
@@ -434,8 +433,6 @@
       'tests/test_empty.h',
       'tests/test_file_io.cc',
       'tests/test_file_io.h',
-      'tests/test_file_mapping.cc',
-      'tests/test_file_mapping.h',
       'tests/test_file_ref.cc',
       'tests/test_file_ref.h',
       'tests/test_file_system.cc',

diff --git a/ppapi/proxy/file_io_resource.h b/ppapi/proxy/file_io_resource.h
@@ -69,6 +69,7 @@ class PPAPI_PROXY_EXPORT FileIOResource
       PP_FileHandle* handle,
       scoped_refptr<TrackedCallback> callback) OVERRIDE;
 
+ private:
   // FileHandleHolder is used to guarantee that file operations will have a
   // valid FD to operate on, even if they're in a different thread.
   // If instead we just passed the raw FD, the FD could be closed before the
@@ -101,11 +102,7 @@ class PPAPI_PROXY_EXPORT FileIOResource
     ~FileHandleHolder();
     PP_FileHandle raw_handle_;
   };
-  scoped_refptr<FileHandleHolder> file_handle() {
-    return file_handle_;
-  }
 
- private:
   // Class to perform file query operations across multiple threads.
   class QueryOp : public base::RefCountedThreadSafe<QueryOp> {
    public:

diff --git a/ppapi/proxy/file_mapping_resource.cc b/ppapi/proxy/file_mapping_resource.cc