diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebCore/plugins/symbian | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebCore/plugins/symbian')
-rw-r--r-- | Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp b/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp index a14ac20..34aec4c 100644 --- a/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp +++ b/Source/WebCore/plugins/symbian/PluginPackageSymbian.cpp @@ -29,6 +29,7 @@ namespace WebCore { +#if ENABLE(NETSCAPE_PLUGIN_API) bool PluginPackage::fetchInfo() { if (!load()) @@ -169,6 +170,7 @@ bool PluginPackage::load() m_loadCount++; return true; } +#endif void PluginPackage::unload() { @@ -186,9 +188,11 @@ void PluginPackage::unload() m_pluginLoader = 0; } +#if ENABLE(NETSCAPE_PLUGIN_API) uint16_t PluginPackage::NPVersion() const { return NP_VERSION_MINOR; } +#endif } |