Changeset 88825 in webkit


Ignore:
Timestamp:
Jun 14, 2011 11:03:08 AM (13 years ago)
Author:
andersca@apple.com
Message:

2011-06-14 Anders Carlsson <andersca@apple.com>

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):
Location:
trunk/Source/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r88819 r88825  
     12011-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
    1282011-06-14  Anders Carlsson  <andersca@apple.com>
    229
  • trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

    r86456 r88825  
    2727#include "PluginInfoStore.h"
    2828
     29#include "PluginModuleInfo.h"
    2930#include <WebCore/KURL.h>
    3031#include <WebCore/MIMETypeRegistry.h>
     
    111112}
    112113
    113 Vector<PluginInfoStore::Plugin> PluginInfoStore::plugins()
     114Vector<PluginModuleInfo> PluginInfoStore::plugins()
    114115{
    115116    loadPluginsIfNecessary();
    116117
    117     Vector<Plugin> plugins(m_plugins);
     118    Vector<PluginModuleInfo> plugins(m_plugins);
    118119
    119120    return plugins;
    120121}
    121122
    122 PluginInfoStore::Plugin PluginInfoStore::findPluginForMIMEType(const String& mimeType)
     123PluginModuleInfo PluginInfoStore::findPluginForMIMEType(const String& mimeType) const
    123124{
    124125    ASSERT(!mimeType.isNull());
     
    137138}
    138139
    139 PluginInfoStore::Plugin PluginInfoStore::findPluginForExtension(const String& extension, String& mimeType)
     140PluginModuleInfo PluginInfoStore::findPluginForExtension(const String& extension, String& mimeType) const
    140141{
    141142    ASSERT(!extension.isNull());
     
    212213}
    213214
    214 PluginInfoStore::Plugin PluginInfoStore::infoForPluginWithPath(const String& pluginPath)
     215PluginInfoStore::Plugin PluginInfoStore::infoForPluginWithPath(const String& pluginPath) const
    215216{
    216217    for (size_t i = 0; i < m_plugins.size(); ++i) {
  • trunk/Source/WebKit2/UIProcess/Plugins/PluginInfoStore.h

    r88735 r88825  
    6565   
    6666    // Returns the info for the plug-in with the given path.
    67     Plugin infoForPluginWithPath(const String& pluginPath);
     67    Plugin infoForPluginWithPath(const String& pluginPath) const;
    6868
    6969private:
    7070
    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;
    7373
    7474    void loadPluginsIfNecessary();
  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp

    r85983 r88825  
    4646}
    4747
    48 void PluginProcessManager::getPluginProcessConnection(PluginInfoStore& pluginInfoStore, const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
     48void PluginProcessManager::getPluginProcessConnection(const PluginInfoStore& pluginInfoStore, const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
    4949{
    5050    ASSERT(!pluginPath.isNull());
     
    6363}
    6464
    65 void PluginProcessManager::getSitesWithData(const PluginInfoStore::Plugin& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, uint64_t callbackID)
     65void PluginProcessManager::getSitesWithData(const PluginModuleInfo& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, uint64_t callbackID)
    6666{
    6767    PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(plugin);
     
    6969}
    7070
    71 void PluginProcessManager::clearSiteData(const PluginInfoStore::Plugin& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
     71void PluginProcessManager::clearSiteData(const PluginModuleInfo& plugin, WebPluginSiteDataManager* webPluginSiteDataManager, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
    7272{
    7373    PluginProcessProxy* pluginProcess = getOrCreatePluginProcess(plugin);
     
    9393}
    9494
    95 PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(const PluginInfoStore::Plugin& plugin)
     95PluginProcessProxy* PluginProcessManager::getOrCreatePluginProcess(const PluginModuleInfo& plugin)
    9696{
    9797    if (PluginProcessProxy* pluginProcess = pluginProcessWithPath(plugin.path))
  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h

    r85983 r88825  
    2929#if ENABLE(PLUGIN_PROCESS)
    3030
    31 #include "PluginInfoStore.h"
     31#include "PluginModuleInfo.h"
    3232#include "WebProcessProxyMessages.h"
    3333#include <wtf/Forward.h>
     
    5151    static PluginProcessManager& shared();
    5252
    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>);
    5454    void removePluginProcessProxy(PluginProcessProxy*);
    5555
    56     void getSitesWithData(const PluginInfoStore::Plugin&, WebPluginSiteDataManager*, uint64_t callbackID);
    57     void clearSiteData(const PluginInfoStore::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);
    5858
    5959    void pluginSyncMessageSendTimedOut(const String& pluginPath);
     
    6262    PluginProcessManager();
    6363
    64     PluginProcessProxy* getOrCreatePluginProcess(const PluginInfoStore::Plugin&);
     64    PluginProcessProxy* getOrCreatePluginProcess(const PluginModuleInfo&);
    6565    PluginProcessProxy* pluginProcessWithPath(const String& pluginPath);
    6666
  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp

    r88647 r88825  
    4545namespace WebKit {
    4646
    47 PassOwnPtr<PluginProcessProxy> PluginProcessProxy::create(PluginProcessManager* PluginProcessManager, const PluginInfoStore::Plugin& pluginInfo)
     47PassOwnPtr<PluginProcessProxy> PluginProcessProxy::create(PluginProcessManager* PluginProcessManager, const PluginModuleInfo& pluginInfo)
    4848{
    4949    return adoptPtr(new PluginProcessProxy(PluginProcessManager, pluginInfo));
  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h

    r86097 r88825  
    3030
    3131#include "Connection.h"
    32 #include "PluginInfoStore.h"
     32#include "PluginModuleInfo.h"
    3333#include "ProcessLauncher.h"
    3434#include "WebProcessProxyMessages.h"
     
    5555class PluginProcessProxy : CoreIPC::Connection::Client, ProcessLauncher::Client {
    5656public:
    57     static PassOwnPtr<PluginProcessProxy> create(PluginProcessManager*, const PluginInfoStore::Plugin&);
     57    static PassOwnPtr<PluginProcessProxy> create(PluginProcessManager*, const PluginModuleInfo&);
    5858    ~PluginProcessProxy();
    5959
    60     const PluginInfoStore::Plugin& pluginInfo() const { return m_pluginInfo; }
     60    const PluginModuleInfo& pluginInfo() const { return m_pluginInfo; }
    6161
    6262    // Asks the plug-in process to create a new connection to a web process. The connection identifier will be
     
    7575#if PLATFORM(MAC)
    7676    // Returns whether the plug-in needs the heap to be marked executable.
    77     static bool pluginNeedsExecutableHeap(const PluginInfoStore::Plugin&);
     77    static bool pluginNeedsExecutableHeap(const PluginModuleInfo&);
    7878
    7979    // Creates a property list in ~/Library/Preferences that contains all the MIME types supported by the plug-in.
    80     static bool createPropertyListFile(const PluginInfoStore::Plugin&);
     80    static bool createPropertyListFile(const PluginModuleInfo&);
    8181#endif
    8282
    8383private:
    84     PluginProcessProxy(PluginProcessManager*, const PluginInfoStore::Plugin&);
     84    PluginProcessProxy(PluginProcessManager*, const PluginModuleInfo&);
    8585
    8686    void pluginProcessCrashedOrFailedToLaunch();
     
    125125   
    126126    // Information about the plug-in.
    127     PluginInfoStore::Plugin m_pluginInfo;
     127    PluginModuleInfo m_pluginInfo;
    128128
    129129    // The connection to the plug-in host process.
  • trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm

    r86097 r88825  
    5454namespace WebKit {
    5555   
    56 bool PluginProcessProxy::pluginNeedsExecutableHeap(const PluginInfoStore::Plugin& pluginInfo)
     56bool PluginProcessProxy::pluginNeedsExecutableHeap(const PluginModuleInfo& pluginInfo)
    5757{
    5858    static bool forceNonexecutableHeapForPlugins = [[NSUserDefaults standardUserDefaults] boolForKey:@"ForceNonexecutableHeapForPlugins"];
     
    6666}
    6767
    68 bool PluginProcessProxy::createPropertyListFile(const PluginInfoStore::Plugin& plugin)
     68bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin)
    6969{
    7070    NSBundle *webKit2Bundle = [NSBundle bundleWithIdentifier:@"com.apple.WebKit2"];
Note: See TracChangeset for help on using the changeset viewer.