summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-25 18:35:48 -0700
committerSteve Block <steveblock@google.com>2010-04-27 17:09:09 +0100
commitaf051345af6893a284d0ce367aa92a6d8a977f38 (patch)
tree40ef7fb628b44e64da784596b2d0e259a104bffb /WebCore
parente55806d9d9fe6be5bb3ee076392f2803ff0179f9 (diff)
downloadexternal_webkit-af051345af6893a284d0ce367aa92a6d8a977f38.zip
external_webkit-af051345af6893a284d0ce367aa92a6d8a977f38.tar.gz
external_webkit-af051345af6893a284d0ce367aa92a6d8a977f38.tar.bz2
Merge webkit.org at r55033 : Implement PluginPackage::NPVersion for Android
See http://trac.webkit.org/changeset/54940 Change-Id: I2c3153606ab0eb9a4598e211def2f07f60eab3da
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/plugins/android/PluginPackageAndroid.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/plugins/android/PluginPackageAndroid.cpp b/WebCore/plugins/android/PluginPackageAndroid.cpp
index ff672f4..5c3a25a 100644
--- a/WebCore/plugins/android/PluginPackageAndroid.cpp
+++ b/WebCore/plugins/android/PluginPackageAndroid.cpp
@@ -407,6 +407,11 @@ bool PluginPackage::equal(const PluginPackage& a, const PluginPackage& b)
return true;
}
+uint16 PluginPackage::NPVersion() const
+{
+ return NP_VERSION_MINOR;
+}
+
} // namespace WebCore
#endif