From 48ec507a560e614dff3de2e4b6148e7b7a6f495f Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Mon, 9 May 2011 18:48:31 +0100
Subject: Merge WebKit at r75315: Fix PluginData::initPlugins()

See http://trac.webkit.org/changeset/75217

Change-Id: I2100dd3ab2d96de8ab18f0cb873dcdff082569c2
---
 Source/WebCore/plugins/android/PluginDataAndroid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/WebCore/plugins')

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();
-- 
cgit v1.1