4 files changed, 124 insertions, 1 deletions
diff --git a/ppapi/thunk/enter.cc b/ppapi/thunk/enter.cc
index 2adc7f2..03937c9b 100644
--- a/ppapi/thunk/enter.cc
+++ b/ppapi/thunk/enter.cc
@@ -59,7 +59,6 @@ EnterBase::EnterBase(PP_Instance instance, SingletonResourceID resource_id,
                      const PP_CompletionCallback& callback)
     : resource_(GetSingletonResource(instance, resource_id)),
       retval_(PP_OK) {
-  DCHECK(resource_ || !instance);
   if (!resource_)
     retval_ = PP_ERROR_BADARGUMENT;
   callback_ = new TrackedCallback(resource_, callback);
diff --git a/ppapi/thunk/interfaces_ppb_public_dev_channel.h b/ppapi/thunk/interfaces_ppb_public_dev_channel.h
index 34e5de4..7269c4e 100644
--- a/ppapi/thunk/interfaces_ppb_public_dev_channel.h
+++ b/ppapi/thunk/interfaces_ppb_public_dev_channel.h
@@ -9,6 +9,7 @@
 
 // Interfaces go here.
 PROXIED_IFACE(PPB_AUDIOFRAME_INTERFACE_0_1, PPB_AudioFrame_0_1)
+PROXIED_IFACE(PPB_FILEMAPPING_INTERFACE_0_1, PPB_FileMapping_0_1)
 PROXIED_IFACE(PPB_FILEREF_INTERFACE_1_2, PPB_FileRef_1_2)
 PROXIED_IFACE(PPB_MEDIASTREAMAUDIOTRACK_INTERFACE_0_1,
               PPB_MediaStreamAudioTrack_0_1)
diff --git a/ppapi/thunk/ppb_file_mapping_api.h b/ppapi/thunk/ppb_file_mapping_api.h
new file mode 100644
index 0000000..530d04b
--- /dev/null
+++ b/ppapi/thunk/ppb_file_mapping_api.h
@@ -0,0 +1,46 @@
+// Copyright 2014 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.
+
+#ifndef PPAPI_THUNK_PPB_FILE_MAPPING_API_H_
+#define PPAPI_THUNK_PPB_FILE_MAPPING_API_H_
+
+#include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
+#include "ppapi/c/pp_instance.h"
+#include "ppapi/c/ppb_file_mapping.h"
+#include "ppapi/shared_impl/singleton_resource_id.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
+
+namespace ppapi {
+
+class TrackedCallback;
+
+namespace thunk {
+
+class PPAPI_THUNK_EXPORT PPB_FileMapping_API {
+ public:
+  virtual ~PPB_FileMapping_API() {}
+
+  virtual int32_t Map(PP_Instance instance,
+                      PP_Resource file_io,
+                      int64_t length,
+                      uint32_t map_protection,
+                      uint32_t map_flags,
+                      int64_t offset,
+                      void** address,
+                      scoped_refptr<TrackedCallback> callback) = 0;
+  virtual int32_t Unmap(PP_Instance instance,
+                        const void* address,
+                        int64_t length,
+                        scoped_refptr<TrackedCallback> callback) = 0;
+  virtual int64_t GetMapPageSize(PP_Instance instance) = 0;
+
+  static const SingletonResourceID kSingletonResourceID =
+      FILE_MAPPING_SINGLETON_ID;
+};
+
+}  // namespace thunk
+}  // namespace ppapi
+
+#endif  // PPAPI_THUNK_PPB_FILE_MAPPING_API_H_
diff --git a/ppapi/thunk/ppb_file_mapping_thunk.cc b/ppapi/thunk/ppb_file_mapping_thunk.cc
new file mode 100644
index 0000000..bdf29ca
--- /dev/null
+++ b/ppapi/thunk/ppb_file_mapping_thunk.cc
@@ -0,0 +1,77 @@
+// Copyright 2014 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.
+
+// From ppb_file_mapping.idl modified Mon Jan 27 11:00:43 2014.
+
+#include "ppapi/c/pp_completion_callback.h"
+#include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_file_mapping.h"
+#include "ppapi/shared_impl/tracked_callback.h"
+#include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
+#include "ppapi/thunk/ppb_file_mapping_api.h"
+
+namespace ppapi {
+namespace thunk {
+
+namespace {
+
+int32_t Map(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) {
+  VLOG(4) << "PPB_FileMapping::Map()";
+  EnterInstanceAPI<PPB_FileMapping_API> enter(instance, callback);
+  if (enter.failed())
+    return enter.retval();
+  return enter.SetResult(enter.functions()->Map(instance,
+                                                file_io,
+                                                length,
+                                                map_protection,
+                                                map_flags,
+                                                offset,
+                                                address,
+                                                enter.callback()));
+}
+
+int32_t Unmap(PP_Instance instance,
+              const void* address,
+              int64_t length,
+              struct PP_CompletionCallback callback) {
+  VLOG(4) << "PPB_FileMapping::Unmap()";
+  EnterInstanceAPI<PPB_FileMapping_API> enter(instance, callback);
+  if (enter.failed())
+    return enter.retval();
+  return enter.SetResult(enter.functions()->Unmap(instance,
+                                                  address,
+                                                  length,
+                                                  enter.callback()));
+}
+
+int64_t GetMapPageSize(PP_Instance instance) {
+  VLOG(4) << "PPB_FileMapping::GetMapPageSize()";
+  EnterInstanceAPI<PPB_FileMapping_API> enter(instance);
+  if (enter.failed())
+    return 0;
+  return enter.functions()->GetMapPageSize(instance);
+}
+
+const PPB_FileMapping_0_1 g_ppb_filemapping_thunk_0_1 = {
+  &Map,
+  &Unmap,
+  &GetMapPageSize
+};
+
+}  // namespace
+
+PPAPI_THUNK_EXPORT const PPB_FileMapping_0_1* GetPPB_FileMapping_0_1_Thunk() {
+  return &g_ppb_filemapping_thunk_0_1;
+}
+
+}  // namespace thunk
+}  // namespace ppapi