diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 00:37:59 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-21 00:37:59 +0000 |
| commit | ee9fbb6d691b3684ea1290b3d5616df0419cccd1 (patch) | |
| tree | cbf5430f0bfc3a393261a0909a22bfc11777b092 /ppapi | |
| parent | f0c0ad061f1c9d4f8077c89d038f3b87c72053e1 (diff) | |
| download | chromium_src-ee9fbb6d691b3684ea1290b3d5616df0419cccd1.zip chromium_src-ee9fbb6d691b3684ea1290b3d5616df0419cccd1.tar.gz chromium_src-ee9fbb6d691b3684ea1290b3d5616df0419cccd1.tar.bz2 | |
NaCl: Address some TODOs from moving PPAPI IRT interface into the Chromium repo
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3787
TEST=build
R=teravest@chromium.org
Review URL: https://codereview.chromium.org/171683019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/nacl_irt/irt_ppapi.h | 8 | ||||
| -rw-r--r-- | ppapi/proxy/irt_ppapi.c | 6 |
2 files changed, 1 insertions, 13 deletions
diff --git a/ppapi/nacl_irt/irt_ppapi.h b/ppapi/nacl_irt/irt_ppapi.h index d1cbbee..344e10c 100644 --- a/ppapi/nacl_irt/irt_ppapi.h +++ b/ppapi/nacl_irt/irt_ppapi.h @@ -33,12 +33,6 @@ struct PP_ThreadFunctions { int (*thread_join)(uintptr_t tid); }; -/* - * TODO(mseaborn): Make this unconditional after the definition of the - * struct has been removed from the NaCl side's irt.h. - */ -#if !defined(NACL_IRT_PPAPIHOOK_v0_1) - #define NACL_IRT_PPAPIHOOK_v0_1 "nacl-irt-ppapihook-0.1" struct nacl_irt_ppapihook { int (*ppapi_start)(const struct PP_StartFunctions*); @@ -46,5 +40,3 @@ struct nacl_irt_ppapihook { }; #endif - -#endif diff --git a/ppapi/proxy/irt_ppapi.c b/ppapi/proxy/irt_ppapi.c index 64c22aa..be6a216 100644 --- a/ppapi/proxy/irt_ppapi.c +++ b/ppapi/proxy/irt_ppapi.c @@ -33,11 +33,7 @@ const void* PPP_GetInterface(const char* interface_name) { return g_pp_functions.PPP_GetInterface(interface_name); } -/* - * TODO(mseaborn): This can be made static when the NaCl side no - * longer refers to it. - */ -const struct nacl_irt_ppapihook nacl_irt_ppapihook = { +static const struct nacl_irt_ppapihook nacl_irt_ppapihook = { irt_ppapi_start, PpapiPluginRegisterThreadCreator, }; |