diff options
| author | Steve Block <steveblock@google.com> | 2011-05-09 18:48:31 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-13 11:33:42 +0100 |
| commit | 48ec507a560e614dff3de2e4b6148e7b7a6f495f (patch) | |
| tree | 857aeed3f2f4e82da84e87efc2eaac7c7db7e9f2 /Source/WebCore/plugins/android | |
| parent | 5b8c725c6846b6f59ba9a5e6f562774f74046622 (diff) | |
| download | external_webkit-48ec507a560e614dff3de2e4b6148e7b7a6f495f.zip external_webkit-48ec507a560e614dff3de2e4b6148e7b7a6f495f.tar.gz external_webkit-48ec507a560e614dff3de2e4b6148e7b7a6f495f.tar.bz2 | |
Merge WebKit at r75315: Fix PluginData::initPlugins()
See http://trac.webkit.org/changeset/75217
Change-Id: I2100dd3ab2d96de8ab18f0cb873dcdff082569c2
Diffstat (limited to 'Source/WebCore/plugins/android')
| -rw-r--r-- | Source/WebCore/plugins/android/PluginDataAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/plugins/android/PluginDataAndroid.cpp b/Source/WebCore/plugins/android/PluginDataAndroid.cpp index f46f0f6..8ac7c94 100644 --- a/Source/WebCore/plugins/android/PluginDataAndroid.cpp +++ b/Source/WebCore/plugins/android/PluginDataAndroid.cpp @@ -33,7 +33,7 @@ namespace WebCore { -void PluginData::initPlugins() +void PluginData::initPlugins(const Page*) { PluginDatabase *db = PluginDatabase::installedPlugins(); const Vector<PluginPackage*> &plugins = db->plugins(); |