Changeset 88825 in webkit
- Timestamp:
- Jun 14, 2011 11:03:08 AM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r88819 r88825 1 2011-06-14 Anders Carlsson <andersca@apple.com> 2 3 Reviewed by Dan Bernstein. 4 5 Start replacing PluginInfoStore::Plugin with PluginModuleInfo 6 https://bugs.webkit.org/show_bug.cgi?id=62651 7 8 * UIProcess/Plugins/PluginInfoStore.cpp: 9 (WebKit::PluginInfoStore::plugins): 10 (WebKit::PluginInfoStore::findPluginForMIMEType): 11 (WebKit::PluginInfoStore::findPluginForExtension): 12 (WebKit::PluginInfoStore::infoForPluginWithPath): 13 * UIProcess/Plugins/PluginInfoStore.h: 14 * UIProcess/Plugins/PluginProcessManager.cpp: 15 (WebKit::PluginProcessManager::getPluginProcessConnection): 16 (WebKit::PluginProcessManager::getSitesWithData): 17 (WebKit::PluginProcessManager::clearSiteData): 18 (WebKit::PluginProcessManager::getOrCreatePluginProcess): 19 * UIProcess/Plugins/PluginProcessManager.h: 20 * UIProcess/Plugins/PluginProcessProxy.cpp: 21 (WebKit::PluginProcessProxy::create): 22 * UIProcess/Plugins/PluginProcessProxy.h: 23 (WebKit::PluginProcessProxy::pluginInfo): 24 * UIProcess/Plugins/mac/PluginProcessProxyMac.mm: 25 (WebKit::PluginProcessProxy::pluginNeedsExecutableHeap): 26 (WebKit::PluginProcessProxy::createPropertyListFile): 27 1 28 2011-06-14 Anders Carlsson <andersca@apple.com> 2 29 -
trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
r86456 r88825 27 27 #include "PluginInfoStore.h" 28 28 29 #include "PluginModuleInfo.h" 29 30 #include <WebCore/KURL.h> 30 31 #include <WebCore/MIMETypeRegistry.h> … … 111 112 } 112 113 113 Vector<Plugin InfoStore::Plugin> PluginInfoStore::plugins()114 Vector<PluginModuleInfo> PluginInfoStore::plugins() 114 115 { 115 116 loadPluginsIfNecessary(); 116 117 117 Vector<Plugin > plugins(m_plugins);118 Vector<PluginModuleInfo> plugins(m_plugins); 118 119 119 120 return plugins; 120 121 } 121 122 122 Plugin InfoStore::Plugin PluginInfoStore::findPluginForMIMEType(const String& mimeType)123 PluginModuleInfo PluginInfoStore::findPluginForMIMEType(const String& mimeType) const 123 124 { 124 125 ASSERT(!mimeType.isNull()); … … 137 138 } 138 139 139 Plugin InfoStore::Plugin PluginInfoStore::findPluginForExtension(const String& extension, String& mimeType)140 PluginModuleInfo PluginInfoStore::findPluginForExtension(const String& extension, String& mimeType) const 140 141 { 141 142 ASSERT(!extension.isNull()); … … 212 213 } 213 214 214 PluginInfoStore::Plugin PluginInfoStore::infoForPluginWithPath(const String& pluginPath) 215 PluginInfoStore::Plugin PluginInfoStore::infoForPluginWithPath(const String& pluginPath) const 215 216 { 216 217 for (size_t i = 0; i < m_plugins.size(); ++i) { -
trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h
r88735 r88825 65 65 66 66 // Returns the info for the plug-in with the given path. 67 Plugin infoForPluginWithPath(const String& pluginPath) ;67 Plugin infoForPluginWithPath(const String& pluginPath) const; 68 68 69 69 private: 70 70 71 Plugin findPluginForMIMEType(const String& mimeType);72 Plugin findPluginForExtension(const String& extension, String& mimeType);71 PluginInfoStore::Plugin findPluginForMIMEType(const String& mimeType) const; 72 PluginInfoStore::Plugin findPluginForExtension(const String& extension, String& mimeType) const; 73 73 74 74 void loadPluginsIfNecessary(); -
trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp
r85983 r88825 46 46 } 47 47 48 void PluginProcessManager::getPluginProcessConnection( PluginInfoStore& pluginInfoStore, const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)48 void PluginProcessManager::getPluginProcessConnection(const PluginInfoStore& pluginInfoStore, const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply) 49 49 { 50 50 ASSERT(!pluginPath.isNull()); … … 63 63 } 64 64 65 void PluginProcessManager::getSitesWithData(const Plugin InfoStore::Plugin& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, uint64_t callbackID)65 void PluginProcessManager::getSitesWithData(const PluginModuleInfo& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, uint64_t callbackID) 66 66 { 67 67 PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(plugin); … … 69 69 } 70 70 71 void PluginProcessManager::clearSiteData(const Plugin InfoStore::Plugin& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)71 void PluginProcessManager::clearSiteData(const PluginModuleInfo& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID) 72 72 { 73 73 PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(plugin); … … 93 93 } 94 94 95 PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(const Plugin InfoStore::Plugin& plugin)95 PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(const PluginModuleInfo& plugin) 96 96 { 97 97 if (PluginProcessProxy* pluginProcess = pluginProcessWithPath(plugin.path)) -
trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h
r85983 r88825 29 29 #if ENABLE(PLUGIN_PROCESS) 30 30 31 #include "Plugin InfoStore.h"31 #include "PluginModuleInfo.h" 32 32 #include "WebProcessProxyMessages.h" 33 33 #include <wtf/Forward.h> … … 51 51 static PluginProcessManager& shared(); 52 52 53 void getPluginProcessConnection( PluginInfoStore&, const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);53 void getPluginProcessConnection(const PluginInfoStore&, const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>); 54 54 void removePluginProcessProxy(PluginProcessProxy*); 55 55 56 void getSitesWithData(const Plugin InfoStore::Plugin&, WebPluginSiteDataManager*, uint64_t callbackID);57 void clearSiteData(const Plugin InfoStore::Plugin&, WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);56 void getSitesWithData(const PluginModuleInfo&, WebPluginSiteDataManager*, uint64_t callbackID); 57 void clearSiteData(const PluginModuleInfo&, WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID); 58 58 59 59 void pluginSyncMessageSendTimedOut(const String& pluginPath); … … 62 62 PluginProcessManager(); 63 63 64 PluginProcessProxy* getOrCreatePluginProcess(const Plugin InfoStore::Plugin&);64 PluginProcessProxy* getOrCreatePluginProcess(const PluginModuleInfo&); 65 65 PluginProcessProxy* pluginProcessWithPath(const String& pluginPath); 66 66 -
trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp
r88647 r88825 45 45 namespace WebKit { 46 46 47 PassOwnPtr<PluginProcessProxy> PluginProcessProxy::create(PluginProcessManager* PluginProcessManager, const Plugin InfoStore::Plugin& pluginInfo)47 PassOwnPtr<PluginProcessProxy> PluginProcessProxy::create(PluginProcessManager* PluginProcessManager, const PluginModuleInfo& pluginInfo) 48 48 { 49 49 return adoptPtr(new PluginProcessProxy(PluginProcessManager, pluginInfo)); -
trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h
r86097 r88825 30 30 31 31 #include "Connection.h" 32 #include "Plugin InfoStore.h"32 #include "PluginModuleInfo.h" 33 33 #include "ProcessLauncher.h" 34 34 #include "WebProcessProxyMessages.h" … … 55 55 class PluginProcessProxy : CoreIPC::Connection::Client, ProcessLauncher::Client { 56 56 public: 57 static PassOwnPtr<PluginProcessProxy> create(PluginProcessManager*, const Plugin InfoStore::Plugin&);57 static PassOwnPtr<PluginProcessProxy> create(PluginProcessManager*, const PluginModuleInfo&); 58 58 ~PluginProcessProxy(); 59 59 60 const Plugin InfoStore::Plugin& pluginInfo() const { return m_pluginInfo; }60 const PluginModuleInfo& pluginInfo() const { return m_pluginInfo; } 61 61 62 62 // Asks the plug-in process to create a new connection to a web process. The connection identifier will be … … 75 75 #if PLATFORM(MAC) 76 76 // Returns whether the plug-in needs the heap to be marked executable. 77 static bool pluginNeedsExecutableHeap(const Plugin InfoStore::Plugin&);77 static bool pluginNeedsExecutableHeap(const PluginModuleInfo&); 78 78 79 79 // Creates a property list in ~/Library/Preferences that contains all the MIME types supported by the plug-in. 80 static bool createPropertyListFile(const Plugin InfoStore::Plugin&);80 static bool createPropertyListFile(const PluginModuleInfo&); 81 81 #endif 82 82 83 83 private: 84 PluginProcessProxy(PluginProcessManager*, const Plugin InfoStore::Plugin&);84 PluginProcessProxy(PluginProcessManager*, const PluginModuleInfo&); 85 85 86 86 void pluginProcessCrashedOrFailedToLaunch(); … … 125 125 126 126 // Information about the plug-in. 127 Plugin InfoStore::Pluginm_pluginInfo;127 PluginModuleInfo m_pluginInfo; 128 128 129 129 // The connection to the plug-in host process. -
trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
r86097 r88825 54 54 namespace WebKit { 55 55 56 bool PluginProcessProxy::pluginNeedsExecutableHeap(const Plugin InfoStore::Plugin& pluginInfo)56 bool PluginProcessProxy::pluginNeedsExecutableHeap(const PluginModuleInfo& pluginInfo) 57 57 { 58 58 static bool forceNonexecutableHeapForPlugins = [[NSUserDefaults standardUserDefaults] boolForKey:@"ForceNonexecutableHeapForPlugins"]; … … 66 66 } 67 67 68 bool PluginProcessProxy::createPropertyListFile(const Plugin InfoStore::Plugin& plugin)68 bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin) 69 69 { 70 70 NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
Note: See TracChangeset
for help on using the changeset viewer.