Commit 70c2c209 authored by andersca@apple.com's avatar andersca@apple.com

2011-05-02 Anders Carlsson <andersca@apple.com>

        Reviewed by Dan Bernstein.

        Make PluginProcessConnectionManager a member of WebProcess
        https://bugs.webkit.org/show_bug.cgi?id=59989

        * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
        * WebProcess/Plugins/PluginProcessConnectionManager.h:
        * WebProcess/Plugins/PluginProxy.cpp:
        (WebKit::PluginProxy::initialize):
        * WebProcess/WebProcess.h:
        (WebKit::WebProcess::pluginProcessConnectionManager):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@85566 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bf5c3d45
2011-05-02 Anders Carlsson <andersca@apple.com>
Reviewed by Dan Bernstein.
Make PluginProcessConnectionManager a member of WebProcess
https://bugs.webkit.org/show_bug.cgi?id=59989
* WebProcess/Plugins/PluginProcessConnectionManager.cpp:
* WebProcess/Plugins/PluginProcessConnectionManager.h:
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::initialize):
* WebProcess/WebProcess.h:
(WebKit::WebProcess::pluginProcessConnectionManager):
2011-05-02 Mark Rowe <mrowe@apple.com>
Reviewed by Brady Eidson.
......
......@@ -34,7 +34,6 @@
#include "WebCoreArgumentCoders.h"
#include "WebProcess.h"
#include "WebProcessProxyMessages.h"
#include <wtf/StdLibExtras.h>
#if PLATFORM(MAC)
#include "MachPort.h"
......@@ -42,12 +41,6 @@
namespace WebKit {
PluginProcessConnectionManager& PluginProcessConnectionManager::shared()
{
DEFINE_STATIC_LOCAL(PluginProcessConnectionManager, pluginProcessConnectionManager, ());
return pluginProcessConnectionManager;
}
PluginProcessConnectionManager::PluginProcessConnectionManager()
{
}
......
......@@ -41,15 +41,13 @@ class PluginProcessConnection;
class PluginProcessConnectionManager {
WTF_MAKE_NONCOPYABLE(PluginProcessConnectionManager);
public:
static PluginProcessConnectionManager& shared();
PluginProcessConnectionManager();
~PluginProcessConnectionManager();
PluginProcessConnection* getPluginProcessConnection(const String& pluginPath);
void removePluginProcessConnection(PluginProcessConnection*);
private:
PluginProcessConnectionManager();
~PluginProcessConnectionManager();
Vector<RefPtr<PluginProcessConnection> > m_pluginProcessConnections;
};
......
......@@ -39,6 +39,7 @@
#include "ShareableBitmap.h"
#include "WebCoreArgumentCoders.h"
#include "WebEvent.h"
#include "WebProcess.h"
#include "WebProcessConnectionMessages.h"
#include <WebCore/GraphicsContext.h>
......@@ -86,7 +87,7 @@ bool PluginProxy::initialize(PluginController* pluginController, const Parameter
m_pluginController = pluginController;
ASSERT(!m_connection);
m_connection = PluginProcessConnectionManager::shared().getPluginProcessConnection(m_pluginPath);
m_connection = WebProcess::shared().pluginProcessConnectionManager().getPluginProcessConnection(m_pluginPath);
if (!m_connection)
return false;
......
......@@ -42,14 +42,14 @@
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#if PLATFORM(MAC)
#include "MachPort.h"
#endif
#if PLATFORM(QT)
class QNetworkAccessManager;
#endif
#if ENABLE(PLUGIN_PROCESS)
#include "PluginProcessConnectionManager.h"
#endif
namespace WebCore {
class IntSize;
class PageGroup;
......@@ -119,6 +119,10 @@ public:
const String& localStorageDirectory() const { return m_localStorageDirectory; }
#if ENABLE(PLUGIN_PROCESS)
PluginProcessConnectionManager& pluginProcessConnectionManager() { return m_pluginProcessConnectionManager; }
#endif
private:
WebProcess();
......@@ -220,6 +224,10 @@ private:
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
RefPtr<SandboxExtension> m_applicationCachePathExtension;
#endif
#if ENABLE(PLUGIN_PROCESS)
PluginProcessConnectionManager m_pluginProcessConnectionManager;
#endif
};
} // namespace WebKit
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment