Diff
Modified: trunk/Source/WebKit2/ChangeLog (138874 => 138875)
--- trunk/Source/WebKit2/ChangeLog 2013-01-05 01:38:58 UTC (rev 138874)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-05 01:47:00 UTC (rev 138875)
@@ -1,5 +1,30 @@
2013-01-04 Sam Weinig <s...@webkit.org>
+ Follow up to https://bugs.webkit.org/show_bug.cgi?id=106144, fixing some
+ of Alexey's review comments.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::downloadProxyConnection):
+ (WebKit::NetworkProcess::createNetworkConnectionToWebProcess):
+ * PluginProcess/PluginProcess.cpp:
+ (WebKit::PluginProcess::createWebProcessConnection):
+ (WebKit::PluginProcess::getSitesWithData):
+ (WebKit::PluginProcess::clearSiteData):
+ * Shared/ChildProcess.h:
+ (WebKit::ChildProcess::parentProcessConnection):
+ * SharedWorkerProcess/SharedWorkerProcess.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::downloadProxyConnection):
+ (WebKit::WebProcess::addVisitedLink):
+ (WebKit::WebProcess::removeWebFrame):
+ (WebKit::WebProcess::getSitesWithPluginData):
+ (WebKit::WebProcess::clearPluginSiteData):
+ (WebKit::WebProcess::addPlugInAutoStartOrigin):
+ (WebKit::WebProcess::plugInDidReceiveUserInteraction):
+ (WebKit::WebProcess::getWebCoreStatistics):
+
+2013-01-04 Sam Weinig <s...@webkit.org>
+
Consolidate process initialization in ChildProcess
https://bugs.webkit.org/show_bug.cgi?id=106144
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (138874 => 138875)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2013-01-05 01:38:58 UTC (rev 138874)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2013-01-05 01:47:00 UTC (rev 138875)
@@ -122,7 +122,7 @@
CoreIPC::Connection* NetworkProcess::downloadProxyConnection()
{
- return connection();
+ return parentProcessConnection();
}
AuthenticationManager& NetworkProcess::downloadsAuthenticationManager()
@@ -166,7 +166,7 @@
m_webProcessConnections.append(connection.release());
CoreIPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
- send(Messages::NetworkProcessProxy::DidCreateNetworkConnectionToWebProcess(clientPort));
+ parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCreateNetworkConnectionToWebProcess(clientPort), 0);
#else
notImplemented();
#endif
Modified: trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp (138874 => 138875)
--- trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2013-01-05 01:38:58 UTC (rev 138874)
+++ trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp 2013-01-05 01:47:00 UTC (rev 138875)
@@ -166,7 +166,7 @@
m_webProcessConnections.append(connection.release());
CoreIPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);
- send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientPort, m_supportsAsynchronousPluginInitialization));
+ parentProcessConnection()->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) {
@@ -198,7 +198,7 @@
m_webProcessConnections.append(connection.release());
CoreIPC::Attachment clientSocket(sockets[0]);
- send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientSocket, m_supportsAsynchronousPluginInitialization));
+ parentProcessConnection()->send(Messages::PluginProcessProxy::DidCreateWebProcessConnection(clientSocket, m_supportsAsynchronousPluginInitialization), 0);
#else
notImplemented();
#endif
@@ -222,7 +222,7 @@
if (NetscapePluginModule* module = netscapePluginModule())
sites = module->sitesWithData();
- send(Messages::PluginProcessProxy::DidGetSitesWithData(sites, callbackID));
+ parentProcessConnection()->send(Messages::PluginProcessProxy::DidGetSitesWithData(sites, callbackID), 0);
}
void PluginProcess::clearSiteData(const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
@@ -239,7 +239,7 @@
}
}
- send(Messages::PluginProcessProxy::DidClearSiteData(callbackID));
+ parentProcessConnection()->send(Messages::PluginProcessProxy::DidClearSiteData(callbackID), 0);
}
void PluginProcess::setMinimumLifetime(double lifetime)
Modified: trunk/Source/WebKit2/Shared/ChildProcess.h (138874 => 138875)
--- trunk/Source/WebKit2/Shared/ChildProcess.h 2013-01-05 01:38:58 UTC (rev 138874)
+++ trunk/Source/WebKit2/Shared/ChildProcess.h 2013-01-05 01:47:00 UTC (rev 138875)
@@ -78,6 +78,8 @@
void setApplicationIsOccluded(bool);
#endif
+ CoreIPC::Connection* parentProcessConnection() const { return m_connection.get(); }
+
// Used by CoreIPC::MessageSender
CoreIPC::Connection* connection() const { return m_connection.get(); }
uint64_t destinationID() const { return 0; }
Modified: trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h (138874 => 138875)
--- trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h 2013-01-05 01:38:58 UTC (rev 138874)
+++ trunk/Source/WebKit2/SharedWorkerProcess/SharedWorkerProcess.h 2013-01-05 01:47:00 UTC (rev 138875)
@@ -31,13 +31,8 @@
#include "ChildProcess.h"
#include <wtf/Forward.h>
-namespace WebCore {
-class RunLoop;
-}
-
namespace WebKit {
-class NetscapePluginModule;
class WebProcessConnection;
struct SharedWorkerProcessCreationParameters;
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (138874 => 138875)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-01-05 01:38:58 UTC (rev 138874)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-01-05 01:47:00 UTC (rev 138875)
@@ -223,7 +223,7 @@
CoreIPC::Connection* WebProcess::downloadProxyConnection()
{
- return connection();
+ return parentProcessConnection();
}
AuthenticationManager& WebProcess::downloadsAuthenticationManager()
@@ -486,7 +486,7 @@
{
if (isLinkVisited(linkHash) || !m_shouldTrackVisitedLinks)
return;
- connection()->send(Messages::WebContext::AddVisitedLinkHash(linkHash), 0);
+ parentProcessConnection()->send(Messages::WebContext::AddVisitedLinkHash(linkHash), 0);
}
void WebProcess::setCacheModel(uint32_t cm)
@@ -654,10 +654,10 @@
// We can end up here after our connection has closed when WebCore's frame life-support timer
// fires when the application is shutting down. There's no need (and no way) to update the UI
// process in this case.
- if (!connection())
+ if (!parentProcessConnection())
return;
- send(Messages::WebProcessProxy::DidDestroyFrame(frameID));
+ parentProcessConnection()->send(Messages::WebProcessProxy::DidDestroyFrame(frameID), 0);
}
WebPageGroupProxy* WebProcess::webPageGroup(uint64_t pageGroupID)
@@ -742,7 +742,7 @@
Vector<String> sites;
copyToVector(sitesSet, sites);
- connection()->send(Messages::WebProcessProxy::DidGetSitesWithPluginData(sites, callbackID), 0);
+ parentProcessConnection()->send(Messages::WebProcessProxy::DidGetSitesWithPluginData(sites, callbackID), 0);
}
void WebProcess::clearPluginSiteData(const Vector<String>& pluginPaths, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
@@ -771,7 +771,7 @@
UNUSED_PARAM(maxAgeInSeconds);
#endif
- connection()->send(Messages::WebProcessProxy::DidClearPluginSiteData(callbackID), 0);
+ parentProcessConnection()->send(Messages::WebProcessProxy::DidClearPluginSiteData(callbackID), 0);
}
#endif
@@ -790,7 +790,7 @@
return;
}
- connection()->send(Messages::WebContext::AddPlugInAutoStartOriginHash(pageOrigin, plugInOriginHash), 0);
+ parentProcessConnection()->send(Messages::WebContext::AddPlugInAutoStartOriginHash(pageOrigin, plugInOriginHash), 0);
}
void WebProcess::didAddPlugInAutoStartOrigin(unsigned plugInOriginHash, double expirationTime)
@@ -816,7 +816,7 @@
if (it->value - currentTime() > plugInAutoStartExpirationTimeUpdateThreshold)
return;
- connection()->send(Messages::WebContext::PlugInDidReceiveUserInteraction(plugInOriginHash), 0);
+ parentProcessConnection()->send(Messages::WebContext::PlugInDidReceiveUserInteraction(plugInOriginHash), 0);
}
static void fromCountedSetToHashMap(TypeCountSet* countedSet, HashMap<String, uint64_t>& map)
@@ -922,7 +922,7 @@
// Get WebCore memory cache statistics
getWebCoreMemoryCacheStatistics(data.webCoreCacheStatistics);
- connection()->send(Messages::WebContext::DidGetWebCoreStatistics(data, callbackID), 0);
+ parentProcessConnection()->send(Messages::WebContext::DidGetWebCoreStatistics(data, callbackID), 0);
}
void WebProcess::garbageCollectJavaScriptObjects()
