diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit2/PluginProcess/PluginProcess.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit2/PluginProcess/PluginProcess.cpp')
| -rw-r--r-- | Source/WebKit2/PluginProcess/PluginProcess.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/WebKit2/PluginProcess/PluginProcess.cpp b/Source/WebKit2/PluginProcess/PluginProcess.cpp index bb1b3b839..759628504 100644 --- a/Source/WebKit2/PluginProcess/PluginProcess.cpp +++ b/Source/WebKit2/PluginProcess/PluginProcess.cpp @@ -32,8 +32,9 @@ #include "Attachment.h" #include "NetscapePlugin.h" #include "NetscapePluginModule.h" -#include "PluginProcessProxyMessages.h" +#include "PluginProcessConnectionMessages.h" #include "PluginProcessCreationParameters.h" +#include "PluginProcessProxyMessages.h" #include "WebProcessConnection.h" #include <WebCore/NotImplemented.h> #include <WebCore/RunLoop.h> @@ -74,6 +75,7 @@ PluginProcess& PluginProcess::shared() PluginProcess::PluginProcess() : ChildProcess(shutdownTimeout) + , m_supportsAsynchronousPluginInitialization(false) #if PLATFORM(MAC) , m_compositingRenderServerPort(MACH_PORT_NULL) #endif @@ -159,6 +161,7 @@ void PluginProcess::initializePluginProcess(const PluginProcessCreationParameter ASSERT(!m_pluginModule); m_pluginPath = parameters.pluginPath; + m_supportsAsynchronousPluginInitialization = parameters.supportsAsynchronousPluginInitialization; platformInitialize(parameters); } @@ -173,11 +176,11 @@ void PluginProcess::createWebProcessConnection() mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort); // Create a listening connection. - RefPtr<WebProcessConnection> connection = WebProcessConnection::create(listeningPort); + RefPtr<WebProcessConnection> connection = WebProcessConnection::create(CoreIPC::Connection::Identifier(listeningPort)); m_webProcessConnections.append(connection.release()); CoreIPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND); - m_connection->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientPort), 0); + m_connection->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientPort, m_supportsAsynchronousPluginInitialization), 0); #elif USE(UNIX_DOMAIN_SOCKETS) int sockets[2]; if (socketpair(AF_UNIX, SOCKET_TYPE, 0, sockets) == -1) { @@ -209,7 +212,7 @@ void PluginProcess::createWebProcessConnection() m_webProcessConnections.append(connection.release()); CoreIPC::Attachment clientSocket(sockets[0]); - m_connection->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientSocket), 0); + m_connection->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientSocket, m_supportsAsynchronousPluginInitialization), 0); #else notImplemented(); #endif |