diff options
author | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 05:29:41 +0000 |
---|---|---|
committer | spang@chromium.org <spang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 05:29:41 +0000 |
commit | 012a171955737b1cbf33fa76fde79a2fccea6385 (patch) | |
tree | 08c25e1a3e3c147f29b52f4b8e8182dcc56897f5 /content/child | |
parent | 488e3954931ee0641278898029a106bdef0a77f4 (diff) | |
download | chromium_src-012a171955737b1cbf33fa76fde79a2fccea6385.zip chromium_src-012a171955737b1cbf33fa76fde79a2fccea6385.tar.gz chromium_src-012a171955737b1cbf33fa76fde79a2fccea6385.tar.bz2 |
Fix debug build when enable_plugins==0
There's lots of link errors in debug builds with enable_plugins==0:
../../content/browser/loader/buffered_resource_handler.cc:441: error: undefined reference to 'content::PluginServiceImpl::GetInstance()'
../../content/browser/renderer_host/render_message_filter.cc:666: error: undefined reference to 'content::PluginServiceImpl::GetInstance()'
../../content/browser/renderer_host/render_message_filter.cc:671: error: undefined reference to 'content::PluginServiceImpl::GetInstance()'
../../content/browser/renderer_host/render_message_filter.cc:679: error: undefined reference to 'content::PluginServiceImpl::GetInstance()'
../../content/browser/renderer_host/render_message_filter.cc:727: error: undefined reference to 'content::PluginServiceImpl::OpenChannelToNpapiPlugin(int, int, GURL const&, GURL const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, content::PluginProc
essHost::Client*)'
../../content/browser/renderer_host/render_message_filter.cc:737: error: undefined reference to 'content::PluginServiceImpl::OpenChannelToPpapiPlugin(int, base::FilePath const&, base::FilePath const&, content::PpapiPluginProcessHost::PluginClient*)'
../../content/browser/renderer_host/render_message_filter.cc:759: error: undefined reference to 'content::BrowserPpapiHostImpl::AddInstance(int, content::PepperRendererInstanceData const&)'
../../content/browser/renderer_host/render_message_filter.cc:762: error: undefined reference to 'content::PpapiPluginProcessHost::DidCreateOutOfProcessInstance(int, int, content::PepperRendererInstanceData const&)'
../../content/browser/renderer_host/render_message_filter.cc:776: error: undefined reference to 'content::BrowserPpapiHostImpl::DeleteInstance(int)'
../../content/browser/renderer_host/render_message_filter.cc:779: error: undefined reference to 'content::PpapiPluginProcessHost::DidDeleteOutOfProcessInstance(int, int)'
../../content/browser/renderer_host/render_message_filter.cc:789: error: undefined reference to 'content::PluginServiceImpl::OpenChannelToPpapiBroker(int, base::FilePath const&, content::PpapiPluginProcessHost::BrokerClient*)'
../../content/child/npapi/npobject_util.cc:131: error: undefined reference to 'content::PluginHost::Singleton()'
../../content/child/npapi/npobject_util.cc:131: error: undefined reference to 'content::PluginHost::PatchNPNetscapeFuncs(_NPNetscapeFuncs*)'
These do not occur in release builds because the dead code containing
these references is removed.
Review URL: https://codereview.chromium.org/66993007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/child')
-rw-r--r-- | content/child/npapi/npobject_util.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/child/npapi/npobject_util.cc b/content/child/npapi/npobject_util.cc index 2fdafc2..e8f5b4e 100644 --- a/content/child/npapi/npobject_util.cc +++ b/content/child/npapi/npobject_util.cc @@ -20,6 +20,7 @@ namespace content { static bool g_plugin_process; namespace { +#if defined(ENABLE_PLUGINS) // The next 7 functions are called by the plugin code when it's using the // NPObject. Plugins always ignore the functions in NPClass (except allocate // and deallocate), and instead just use the function pointers that were @@ -123,13 +124,16 @@ NPNetscapeFuncs *GetHostFunctions() { return &host_funcs; } +#endif // defined(ENABLE_PLUGINS) } +#if defined(ENABLE_PLUGINS) void PatchNPNFunctions() { g_plugin_process = true; NPNetscapeFuncs* funcs = GetHostFunctions(); PluginHost::Singleton()->PatchNPNetscapeFuncs(funcs); } +#endif bool IsPluginProcess() { return g_plugin_process; |