Diff
Modified: trunk/Source/WebKit2/ChangeLog (138682 => 138683)
--- trunk/Source/WebKit2/ChangeLog 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-03 01:06:53 UTC (rev 138683)
@@ -1,5 +1,46 @@
2013-01-02 Sam Weinig <s...@webkit.org>
+ Stop pretending its possible to run the WebProcess in threaded mode
+ https://bugs.webkit.org/show_bug.cgi?id=105969
+
+ Reviewed by Alexey Proskuryakov.
+
+ - Removes WebProcess::isSeparateProcess()
+ - Stop storing a RunLoop on the WebProcess and just use RunLoop::main().
+
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::NetworkProcessConnection):
+ * WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp:
+ (WebKit::NPRuntimeObjectMap::NPRuntimeObjectMap):
+ * WebProcess/Plugins/PluginProcessConnection.cpp:
+ (WebKit::PluginProcessConnection::PluginProcessConnection):
+ * WebProcess/WebPage/DrawingAreaImpl.cpp:
+ (WebKit::DrawingAreaImpl::DrawingAreaImpl):
+ * WebProcess/WebPage/PageOverlay.cpp:
+ (WebKit::PageOverlay::PageOverlay):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::close):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeConnection):
+ (WebKit::WebProcess::shouldTerminate):
+ (WebKit::WebProcess::terminate):
+ (WebKit::WebProcess::didClose):
+ * WebProcess/WebProcess.h:
+ (WebProcess):
+ * WebProcess/efl/WebProcessMainEfl.cpp:
+ (WebKit::WebProcessMainEfl):
+ * WebProcess/gtk/WebProcessMainGtk.cpp:
+ (WebKit::WebProcessMainGtk):
+ * WebProcess/mac/WebProcessInitialization.mm:
+ (WebKit::initializeWebProcess):
+ * WebProcess/qt/WebProcessMainQt.cpp:
+ (WebKit::WebProcessMainQt):
+ * WebProcess/win/WebProcessMainWin.cpp:
+ (WebKit::WebProcessMain):
+
+2013-01-02 Sam Weinig <s...@webkit.org>
+
Factor out NetworkProcess initialization into its own function in preparation of adding a NetworkProcess service
https://bugs.webkit.org/show_bug.cgi?id=105946
Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -42,7 +42,7 @@
NetworkProcessConnection::NetworkProcessConnection(CoreIPC::Connection::Identifier connectionIdentifier)
{
- m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, WebProcess::shared().runLoop());
+ m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, RunLoop::main());
m_connection->open();
}
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -49,7 +49,7 @@
NPRuntimeObjectMap::NPRuntimeObjectMap(PluginView* pluginView)
: m_pluginView(pluginView)
- , m_finalizationTimer(WebProcess::shared().runLoop(), this, &NPRuntimeObjectMap::invalidateQueuedObjects)
+ , m_finalizationTimer(RunLoop::main(), this, &NPRuntimeObjectMap::invalidateQueuedObjects)
{
}
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -47,7 +47,7 @@
, m_supportsAsynchronousPluginInitialization(supportsAsynchronousPluginInitialization)
, m_processType(processType)
{
- m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, WebProcess::shared().runLoop());
+ m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, RunLoop::main());
m_npRemoteObjectMap = NPRemoteObjectMap::create(m_connection.get());
Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -65,8 +65,8 @@
, m_wantsToExitAcceleratedCompositingMode(false)
, m_isPaintingSuspended(!parameters.isVisible)
, m_alwaysUseCompositing(false)
- , m_displayTimer(WebProcess::shared().runLoop(), this, &DrawingAreaImpl::displayTimerFired)
- , m_exitCompositingTimer(WebProcess::shared().runLoop(), this, &DrawingAreaImpl::exitAcceleratedCompositingMode)
+ , m_displayTimer(RunLoop::main(), this, &DrawingAreaImpl::displayTimerFired)
+ , m_exitCompositingTimer(RunLoop::main(), this, &DrawingAreaImpl::exitAcceleratedCompositingMode)
{
if (webPage->corePage()->settings()->acceleratedDrawingEnabled() || webPage->corePage()->settings()->forceCompositingMode())
m_alwaysUseCompositing = true;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/PageOverlay.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/WebPage/PageOverlay.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/WebPage/PageOverlay.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -49,7 +49,7 @@
PageOverlay::PageOverlay(Client* client)
: m_client(client)
, m_webPage(0)
- , m_fadeAnimationTimer(WebProcess::shared().runLoop(), this, &PageOverlay::fadeAnimationTimerFired)
+ , m_fadeAnimationTimer(RunLoop::main(), this, &PageOverlay::fadeAnimationTimerFired)
, m_fadeAnimationStartTime(0.0)
, m_fadeAnimationDuration(fadeAnimationDuration)
, m_fadeAnimationType(NoAnimation)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -245,7 +245,7 @@
#elif PLATFORM(GTK)
, m_accessibilityObject(0)
#endif
- , m_setCanStartMediaTimer(WebProcess::shared().runLoop(), this, &WebPage::setCanStartMediaTimerFired)
+ , m_setCanStartMediaTimer(RunLoop::main(), this, &WebPage::setCanStartMediaTimerFired)
, m_findController(this)
#if ENABLE(TOUCH_EVENTS)
#if PLATFORM(QT)
@@ -808,7 +808,7 @@
WebProcess::shared().removeWebPage(m_pageID);
if (isRunningModal)
- WebProcess::shared().runLoop()->stop();
+ RunLoop::main()->stop();
}
void WebPage::tryClose()
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -200,11 +200,11 @@
#endif
}
-void WebProcess::initialize(CoreIPC::Connection::Identifier serverIdentifier, RunLoop* runLoop)
+void WebProcess::initializeConnection(CoreIPC::Connection::Identifier serverIdentifier)
{
ASSERT(!m_connection);
- m_connection = CoreIPC::Connection::createClientConnection(serverIdentifier, this, runLoop);
+ m_connection = CoreIPC::Connection::createClientConnection(serverIdentifier, this, RunLoop::main());
m_connection->setDidCloseOnConnectionWorkQueueCallback(ChildProcess::didCloseOnConnectionWorkQueue);
m_connection->setShouldExitOnSyncMessageSendFailure(true);
m_connection->addQueueClient(&m_eventDispatcher);
@@ -212,8 +212,6 @@
m_connection->open();
m_webConnection = WebConnectionToUIProcess::create(this);
-
- m_runLoop = runLoop;
}
void WebProcess::didCreateDownload()
@@ -545,18 +543,8 @@
enableTermination();
}
-bool WebProcess::isSeparateProcess() const
-{
- // If we're running on the main run loop, we assume that we're in a separate process.
- return m_runLoop == RunLoop::main();
-}
-
bool WebProcess::shouldTerminate()
{
- // Keep running forever if we're running in the same process.
- if (!isSeparateProcess())
- return false;
-
ASSERT(m_pageMap.isEmpty());
#if ENABLE(NETWORK_PROCESS)
@@ -589,7 +577,7 @@
m_webConnection = nullptr;
platformTerminate();
- m_runLoop->stop();
+ RunLoop::main()->stop();
}
void WebProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)
@@ -622,9 +610,6 @@
void WebProcess::didClose(CoreIPC::Connection*)
{
- // When running in the same process the connection will never be closed.
- ASSERT(isSeparateProcess());
-
#ifndef NDEBUG
m_inDidClose = true;
@@ -640,7 +625,7 @@
#endif
// The UI process closed this connection, shut down.
- m_runLoop->stop();
+ RunLoop::main()->stop();
}
void WebProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2013-01-03 01:06:53 UTC (rev 138683)
@@ -120,12 +120,11 @@
m_supplements.add(T::supplementName(), new T(this));
}
- void initialize(CoreIPC::Connection::Identifier, WebCore::RunLoop*);
+ void initializeConnection(CoreIPC::Connection::Identifier);
virtual CoreIPC::Connection* connection() const OVERRIDE { return m_connection.get(); }
virtual uint64_t destinationID() const OVERRIDE { return 0; }
- WebCore::RunLoop* runLoop() const { return m_runLoop; }
WebConnectionToUIProcess* webConnectionToUIProcess() const { return m_webConnection.get(); }
WebPage* webPage(uint64_t pageID) const;
@@ -141,8 +140,6 @@
InjectedBundle* injectedBundle() const { return m_injectedBundle.get(); }
- bool isSeparateProcess() const;
-
#if PLATFORM(MAC)
void initializeShim();
void initializeSandbox(const String& clientIdentifier);
@@ -320,8 +317,6 @@
bool m_inDidClose;
- WebCore::RunLoop* m_runLoop;
-
// FIXME: The visited link table should not be per process.
VisitedLinkTable m_visitedLinkTable;
bool m_shouldTrackVisitedLinks;
Modified: trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -114,7 +114,7 @@
soup_cache_load(soupCache);
int socket = atoi(argv[1]);
- WebProcess::shared().initialize(socket, RunLoop::main());
+ WebProcess::shared().initializeConnection(socket);
RunLoop::run();
soup_cache_flush(soupCache);
Modified: trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -63,7 +63,7 @@
RunLoop::initializeMainRunLoop();
int socket = atoi(argv[1]);
- WebProcess::shared().initialize(socket, RunLoop::main());
+ WebProcess::shared().initializeConnection(socket);
// Despite using system CAs to validate certificates we're
// accepting invalid certificates by default. New API will be
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessInitialization.mm (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessInitialization.mm 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessInitialization.mm 2013-01-03 01:06:53 UTC (rev 138683)
@@ -54,7 +54,7 @@
WebProcess& webProcess = WebProcess::shared();
webProcess.initializeShim();
webProcess.initializeSandbox(parameters.clientIdentifier);
- webProcess.initialize(parameters.connectionIdentifier, RunLoop::main());
+ webProcess.initializeConnection(parameters.connectionIdentifier);
WKAXRegisterRemoteApp();
}
Modified: trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -184,7 +184,7 @@
#endif
#endif
- WebKit::WebProcess::shared().initialize(identifier, RunLoop::main());
+ WebKit::WebProcess::shared().initializeConnection(identifier);
RunLoop::run();
Modified: trunk/Source/WebKit2/WebProcess/win/WebProcessMainWin.cpp (138682 => 138683)
--- trunk/Source/WebKit2/WebProcess/win/WebProcessMainWin.cpp 2013-01-03 01:04:29 UTC (rev 138682)
+++ trunk/Source/WebKit2/WebProcess/win/WebProcessMainWin.cpp 2013-01-03 01:06:53 UTC (rev 138683)
@@ -78,7 +78,8 @@
if (!clientIdentifier)
return 0;
- WebProcess::shared().initialize(clientIdentifier, RunLoop::main());
+ WebProcess::shared().initializeConnection(clientIdentifier);
+
RunLoop::run();
return 0;
