diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-17 15:33:38 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-17 15:33:38 +0000 |
| commit | db118aba2ef95898ccb0049aa2501103710630c4 (patch) | |
| tree | 0f855ac099bb2880e809ad53f7220a42625a8d13 /webkit/plugins/npapi | |
| parent | b9b1e7a4fa49c108c40536cee59ce0b2b0a09d86 (diff) | |
| download | chromium_src-db118aba2ef95898ccb0049aa2501103710630c4.zip chromium_src-db118aba2ef95898ccb0049aa2501103710630c4.tar.gz chromium_src-db118aba2ef95898ccb0049aa2501103710630c4.tar.bz2 | |
Update NPAPI headers to latest npapi-sdk
Updates to r10 of the upstream 'npapi-sdk' project headers (the replacement for npapi-headers). Also further reduces forking, by removing some old local changes that are no longer necassary.
BUG=42645
TEST=Everything still compiles
Review URL: http://codereview.chromium.org/7033014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/npapi')
| -rw-r--r-- | webkit/plugins/npapi/plugin_host.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc index e92c22e..7e73ea7 100644 --- a/webkit/plugins/npapi/plugin_host.cc +++ b/webkit/plugins/npapi/plugin_host.cc @@ -35,6 +35,13 @@ using WebKit::WebBindings; +// Declarations for stub implementations of deprecated functions, which are no +// longer listed in npapi.h. +extern "C" { +void* NPN_GetJavaEnv(); +void* NPN_GetJavaPeer(NPP); +} + namespace webkit { namespace npapi { @@ -108,7 +115,7 @@ void PluginHost::InitializeHostFuncs() { host_funcs_.memflush = &NPN_MemFlush; host_funcs_.reloadplugins = &NPN_ReloadPlugins; - // We don't implement java yet + // Stubs for deprecated Java functions host_funcs_.getJavaEnv = &NPN_GetJavaEnv; host_funcs_.getJavaPeer = &NPN_GetJavaPeer; |