[NaCl SDK] Switch ppapi_simple to C library

native_client_sdk/src/libraries/ppapi_simple/ps_entrypoints_cpp.cc

Index: native_client_sdk/src/libraries/ppapi_simple/ps_entrypoints_cpp.cc
diff --git a/native_client_sdk/src/libraries/ppapi_simple/ps_entrypoints_cpp.cc b/native_client_sdk/src/libraries/ppapi_simple/ps_entrypoints_cpp.cc
new file mode 100644
index 0000000000000000000000000000000000000000..354d753dd475e3244bdcc7e9c886cb4b35f1aad6
--- /dev/null
+++ b/native_client_sdk/src/libraries/ppapi_simple/ps_entrypoints_cpp.cc
@@ -0,0 +1,71 @@
+// Copyright (c) 2015 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 <ppapi/c/pp_errors.h>
+#include <ppapi/c/pp_module.h>
+#include <ppapi/c/ppb.h>
+#include <ppapi/cpp/instance.h>
+#include <ppapi/cpp/module.h>
+
+#include "ppapi_simple/ps_interface.h"
+
+class PSModule : public pp::Module {
+ public:
+  virtual pp::Instance* CreateInstance(PP_Instance instance) {
+    // Should not get here.
+    // This is only called by libppapi_cpp in Instance_DidCreate. That function
+    // is called by the PPP_Instance handler in libppapi_cpp, but we handle all
+    // plugin interfaces in ppapi_simple.
+    assert(0);
+    return NULL;
+  }
+};
+
+static PSModule* s_module;
+
+namespace pp {
+
+Module* Module::Get() {
+  return s_module;
+}
+
+// This shouldn't be called (it is only referenced by PPP_InitialzeModule in
+// ppapi_cpp, which we override), but is needed to successfully link.
+Module* CreateModule() {
+  assert(0);
+  return NULL;
+}
+
+}  // namespace pp
+
+extern "C" {

[Sam Clegg, 2015/02/19 21:24:20]

These should be declared as extern "C" in the headers, no?  so it should not be
needed here.

[binji, 2015/02/20 17:33:48]

True for PPP_*, but the other definitions are not defined in a header. I didn't
want to put them in the public interface.

+
+// Defined in ps_instance.c.
+const void* PSGetInterfaceImplementation(const char*);
+extern PPB_GetInterface g_ps_get_interface;
+
+int32_t PPP_InitializeModule(PP_Module module_id,
+                             PPB_GetInterface get_interface) {
+  g_ps_get_interface = get_interface;
+  PSInterfaceInit();
+
+  PSModule* module = new PSModule();
+  if (!module->InternalInit(module_id, get_interface)) {
+    delete s_module;
+    return PP_ERROR_FAILED;
+  }
+  s_module = module;
+  return PP_OK;
+}
+
+const void* PPP_GetInterface(const char* interface_name) {
+  return PSGetInterfaceImplementation(interface_name);
+}
+
+void PPP_ShutdownModule(void) {
+  delete s_module;
+  s_module = NULL;
+}
+
+}  // extern "C"