Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Unified Diff: ppapi/nacl_irt/irt_interfaces.cc

Issue 1244533006: NaCl cleanup: Split out irt_interfaces.cc from irt_ppapi.cc (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/nacl_irt/irt_interfaces.cc
diff --git a/ppapi/nacl_irt/irt_ppapi.cc b/ppapi/nacl_irt/irt_interfaces.cc
similarity index 71%
copy from ppapi/nacl_irt/irt_ppapi.cc
copy to ppapi/nacl_irt/irt_interfaces.cc
index a9c13eb89072a14a4b007c5033b5a41869e8df6d..77ce9d8415e03f277b0853b40c01fa8373cfc949 100644
--- a/ppapi/nacl_irt/irt_ppapi.cc
+++ b/ppapi/nacl_irt/irt_interfaces.cc
@@ -1,7 +1,9 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 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/nacl_irt/irt_interfaces.h"
+
#include <unistd.h>
#include "build/build_config.h"
@@ -9,36 +11,9 @@
#include "native_client/src/trusted/service_runtime/include/sys/unistd.h"
#include "native_client/src/untrusted/irt/irt.h"
#include "ppapi/nacl_irt/irt_manifest.h"
-#include "ppapi/nacl_irt/irt_ppapi.h"
-#include "ppapi/nacl_irt/plugin_main.h"
#include "ppapi/nacl_irt/public/irt_ppapi.h"
#include "ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h"
-static struct PP_StartFunctions g_pp_functions;
-
-int irt_ppapi_start(const struct PP_StartFunctions* funcs) {
- g_pp_functions = *funcs;
- return PpapiPluginMain();
-}
-
-int32_t PPP_InitializeModule(PP_Module module_id,
- PPB_GetInterface get_browser_interface) {
- return g_pp_functions.PPP_InitializeModule(module_id, get_browser_interface);
-}
-
-void PPP_ShutdownModule(void) {
- g_pp_functions.PPP_ShutdownModule();
-}
-
-const void* PPP_GetInterface(const char* interface_name) {
- return g_pp_functions.PPP_GetInterface(interface_name);
-}
-
-static const struct nacl_irt_ppapihook nacl_irt_ppapihook = {
- irt_ppapi_start,
- PpapiPluginRegisterThreadCreator,
-};
-
#if defined(OS_NACL_SFI)
static int ppapihook_pnacl_private_filter(void) {
int pnacl_mode = sysconf(NACL_ABI__SC_NACL_PNACL_MODE);

Powered by Google App Engine
This is Rietveld 408576698