Diff
Modified: trunk/Source/WebKit2/ChangeLog (88824 => 88825)
--- trunk/Source/WebKit2/ChangeLog 2011-06-14 17:57:01 UTC (rev 88824)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-14 18:03:08 UTC (rev 88825)
@@ -1,5 +1,32 @@
2011-06-14 Anders Carlsson <[email protected]>
+ Reviewed by Dan Bernstein.
+
+ Start replacing PluginInfoStore::Plugin with PluginModuleInfo
+ https://bugs.webkit.org/show_bug.cgi?id=62651
+
+ * UIProcess/Plugins/PluginInfoStore.cpp:
+ (WebKit::PluginInfoStore::plugins):
+ (WebKit::PluginInfoStore::findPluginForMIMEType):
+ (WebKit::PluginInfoStore::findPluginForExtension):
+ (WebKit::PluginInfoStore::infoForPluginWithPath):
+ * UIProcess/Plugins/PluginInfoStore.h:
+ * UIProcess/Plugins/PluginProcessManager.cpp:
+ (WebKit::PluginProcessManager::getPluginProcessConnection):
+ (WebKit::PluginProcessManager::getSitesWithData):
+ (WebKit::PluginProcessManager::clearSiteData):
+ (WebKit::PluginProcessManager::getOrCreatePluginProcess):
+ * UIProcess/Plugins/PluginProcessManager.h:
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::create):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ (WebKit::PluginProcessProxy::pluginInfo):
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::pluginNeedsExecutableHeap):
+ (WebKit::PluginProcessProxy::createPropertyListFile):
+
+2011-06-14 Anders Carlsson <[email protected]>
+
Reviewed by Darin Adler.
Add PluginModuleInfo header and prepare for renaming of PluginInfoStore::Plugin to PluginModuleInfo
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (88824 => 88825)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2011-06-14 17:57:01 UTC (rev 88824)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp 2011-06-14 18:03:08 UTC (rev 88825)
@@ -26,6 +26,7 @@
#include "config.h"
#include "PluginInfoStore.h"
+#include "PluginModuleInfo.h"
#include <WebCore/KURL.h>
#include <WebCore/MIMETypeRegistry.h>
#include <algorithm>
@@ -110,16 +111,16 @@
plugins.append(plugin);
}
-Vector<PluginInfoStore::Plugin> PluginInfoStore::plugins()
+Vector<PluginModuleInfo> PluginInfoStore::plugins()
{
loadPluginsIfNecessary();
- Vector<Plugin> plugins(m_plugins);
+ Vector<PluginModuleInfo> plugins(m_plugins);
return plugins;
}
-PluginInfoStore::Plugin PluginInfoStore::findPluginForMIMEType(const String& mimeType)
+PluginModuleInfo PluginInfoStore::findPluginForMIMEType(const String& mimeType) const
{
ASSERT(!mimeType.isNull());
@@ -136,7 +137,7 @@
return Plugin();
}
-PluginInfoStore::Plugin PluginInfoStore::findPluginForExtension(const String& extension, String& mimeType)
+PluginModuleInfo PluginInfoStore::findPluginForExtension(const String& extension, String& mimeType) const
{
ASSERT(!extension.isNull());
@@ -211,7 +212,7 @@
return Plugin();
}
-PluginInfoStore::Plugin PluginInfoStore::infoForPluginWithPath(const String& pluginPath)
+PluginInfoStore::Plugin PluginInfoStore::infoForPluginWithPath(const String& pluginPath) const
{
for (size_t i = 0; i < m_plugins.size(); ++i) {
if (m_plugins[i].path == pluginPath)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h (88824 => 88825)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h 2011-06-14 17:57:01 UTC (rev 88824)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h 2011-06-14 18:03:08 UTC (rev 88825)
@@ -64,12 +64,12 @@
Plugin findPlugin(String& mimeType, const WebCore::KURL& url);
// Returns the info for the plug-in with the given path.
- Plugin infoForPluginWithPath(const String& pluginPath);
+ Plugin infoForPluginWithPath(const String& pluginPath) const;
private:
- Plugin findPluginForMIMEType(const String& mimeType);
- Plugin findPluginForExtension(const String& extension, String& mimeType);
+ PluginInfoStore::Plugin findPluginForMIMEType(const String& mimeType) const;
+ PluginInfoStore::Plugin findPluginForExtension(const String& extension, String& mimeType) const;
void loadPluginsIfNecessary();
static void loadPlugin(Vector<Plugin>& plugins, const String& pluginPath);
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp (88824 => 88825)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2011-06-14 17:57:01 UTC (rev 88824)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp 2011-06-14 18:03:08 UTC (rev 88825)
@@ -45,7 +45,7 @@
{
}
-void PluginProcessManager::getPluginProcessConnection(PluginInfoStore& pluginInfoStore, const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
+void PluginProcessManager::getPluginProcessConnection(const PluginInfoStore& pluginInfoStore, const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
{
ASSERT(!pluginPath.isNull());
@@ -62,13 +62,13 @@
m_pluginProcesses.remove(vectorIndex);
}
-void PluginProcessManager::getSitesWithData(const PluginInfoStore::Plugin& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, uint64_t callbackID)
+void PluginProcessManager::getSitesWithData(const PluginModuleInfo& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, uint64_t callbackID)
{
PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(plugin);
pluginProcess->getSitesWithData(webPluginSiteDataManager, callbackID);
}
-void PluginProcessManager::clearSiteData(const PluginInfoStore::Plugin& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
+void PluginProcessManager::clearSiteData(const PluginModuleInfo& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
{
PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(plugin);
pluginProcess->clearSiteData(webPluginSiteDataManager, sites, flags, maxAgeInSeconds, callbackID);
@@ -92,7 +92,7 @@
return 0;
}
-PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(const PluginInfoStore::Plugin& plugin)
+PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(const PluginModuleInfo& plugin)
{
if (PluginProcessProxy* pluginProcess = pluginProcessWithPath(plugin.path))
return pluginProcess;
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h (88824 => 88825)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2011-06-14 17:57:01 UTC (rev 88824)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h 2011-06-14 18:03:08 UTC (rev 88825)
@@ -28,7 +28,7 @@
#if ENABLE(PLUGIN_PROCESS)
-#include "PluginInfoStore.h"
+#include "PluginModuleInfo.h"
#include "WebProcessProxyMessages.h"
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
@@ -50,18 +50,18 @@
public:
static PluginProcessManager& shared();
- void getPluginProcessConnection(PluginInfoStore&, const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
+ void getPluginProcessConnection(const PluginInfoStore&, const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
void removePluginProcessProxy(PluginProcessProxy*);
- void getSitesWithData(const PluginInfoStore::Plugin&, WebPluginSiteDataManager*, uint64_t callbackID);
- void clearSiteData(const PluginInfoStore::Plugin&, WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
+ void getSitesWithData(const PluginModuleInfo&, WebPluginSiteDataManager*, uint64_t callbackID);
+ void clearSiteData(const PluginModuleInfo&, WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
void pluginSyncMessageSendTimedOut(const String& pluginPath);
private:
PluginProcessManager();
- PluginProcessProxy* getOrCreatePluginProcess(const PluginInfoStore::Plugin&);
+ PluginProcessProxy* getOrCreatePluginProcess(const PluginModuleInfo&);
PluginProcessProxy* pluginProcessWithPath(const String& pluginPath);
Vector<PluginProcessProxy*> m_pluginProcesses;
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (88824 => 88825)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2011-06-14 17:57:01 UTC (rev 88824)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2011-06-14 18:03:08 UTC (rev 88825)
@@ -44,7 +44,7 @@
namespace WebKit {
-PassOwnPtr<PluginProcessProxy> PluginProcessProxy::create(PluginProcessManager* PluginProcessManager, const PluginInfoStore::Plugin& pluginInfo)
+PassOwnPtr<PluginProcessProxy> PluginProcessProxy::create(PluginProcessManager* PluginProcessManager, const PluginModuleInfo& pluginInfo)
{
return adoptPtr(new PluginProcessProxy(PluginProcessManager, pluginInfo));
}
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (88824 => 88825)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2011-06-14 17:57:01 UTC (rev 88824)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2011-06-14 18:03:08 UTC (rev 88825)
@@ -29,7 +29,7 @@
#if ENABLE(PLUGIN_PROCESS)
#include "Connection.h"
-#include "PluginInfoStore.h"
+#include "PluginModuleInfo.h"
#include "ProcessLauncher.h"
#include "WebProcessProxyMessages.h"
#include <wtf/Deque.h>
@@ -54,10 +54,10 @@
class PluginProcessProxy : CoreIPC::Connection::Client, ProcessLauncher::Client {
public:
- static PassOwnPtr<PluginProcessProxy> create(PluginProcessManager*, const PluginInfoStore::Plugin&);
+ static PassOwnPtr<PluginProcessProxy> create(PluginProcessManager*, const PluginModuleInfo&);
~PluginProcessProxy();
- const PluginInfoStore::Plugin& pluginInfo() const { return m_pluginInfo; }
+ const PluginModuleInfo& pluginInfo() const { return m_pluginInfo; }
// Asks the plug-in process to create a new connection to a web process. The connection identifier will be
// encoded in the given argument encoder and sent back to the connection of the given web process.
@@ -74,14 +74,14 @@
#if PLATFORM(MAC)
// Returns whether the plug-in needs the heap to be marked executable.
- static bool pluginNeedsExecutableHeap(const PluginInfoStore::Plugin&);
+ static bool pluginNeedsExecutableHeap(const PluginModuleInfo&);
// Creates a property list in ~/Library/Preferences that contains all the MIME types supported by the plug-in.
- static bool createPropertyListFile(const PluginInfoStore::Plugin&);
+ static bool createPropertyListFile(const PluginModuleInfo&);
#endif
private:
- PluginProcessProxy(PluginProcessManager*, const PluginInfoStore::Plugin&);
+ PluginProcessProxy(PluginProcessManager*, const PluginModuleInfo&);
void pluginProcessCrashedOrFailedToLaunch();
@@ -124,7 +124,7 @@
PluginProcessManager* m_pluginProcessManager;
// Information about the plug-in.
- PluginInfoStore::Plugin m_pluginInfo;
+ PluginModuleInfo m_pluginInfo;
// The connection to the plug-in host process.
RefPtr<CoreIPC::Connection> m_connection;
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (88824 => 88825)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2011-06-14 17:57:01 UTC (rev 88824)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2011-06-14 18:03:08 UTC (rev 88825)
@@ -53,7 +53,7 @@
namespace WebKit {
-bool PluginProcessProxy::pluginNeedsExecutableHeap(const PluginInfoStore::Plugin& pluginInfo)
+bool PluginProcessProxy::pluginNeedsExecutableHeap(const PluginModuleInfo& pluginInfo)
{
static bool forceNonexecutableHeapForPlugins = [[NSUserDefaults standardUserDefaults] boolForKey:@"ForceNonexecutableHeapForPlugins"];
if (forceNonexecutableHeapForPlugins)
@@ -65,7 +65,7 @@
return true;
}
-bool PluginProcessProxy::createPropertyListFile(const PluginInfoStore::Plugin& plugin)
+bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin)
{
NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
NSString *frameworksPath = [[webKit2Bundle bundlePath] stringByDeletingLastPathComponent];
