Title: [169384] trunk/Source/WebKit2
- Revision
- 169384
- Author
- [email protected]
- Date
- 2014-05-27 09:30:50 -0700 (Tue, 27 May 2014)
Log Message
Revert r169362 since it broke the ML build.
* Platform/IPC/Connection.h:
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::ConnectionTerminationWatchdog::createConnectionTerminationWatchdog): Deleted.
(IPC::ConnectionTerminationWatchdog::ConnectionTerminationWatchdog): Deleted.
(IPC::ConnectionTerminationWatchdog::watchdogTimerFired): Deleted.
(IPC::Connection::terminateSoon): Deleted.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::removeWebPage):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169383 => 169384)
--- trunk/Source/WebKit2/ChangeLog 2014-05-27 16:25:56 UTC (rev 169383)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-27 16:30:50 UTC (rev 169384)
@@ -1,3 +1,16 @@
+2014-05-27 Jessie Berlin <[email protected]>
+
+ Revert r169362 since it broke the ML build.
+
+ * Platform/IPC/Connection.h:
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::ConnectionTerminationWatchdog::createConnectionTerminationWatchdog): Deleted.
+ (IPC::ConnectionTerminationWatchdog::ConnectionTerminationWatchdog): Deleted.
+ (IPC::ConnectionTerminationWatchdog::watchdogTimerFired): Deleted.
+ (IPC::Connection::terminateSoon): Deleted.
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::removeWebPage):
+
2014-05-27 Jon Lee <[email protected]>
Update ENABLE(MEDIA_SOURCE) on Mac
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (169383 => 169384)
--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-05-27 16:25:56 UTC (rev 169383)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-05-27 16:30:50 UTC (rev 169384)
@@ -183,7 +183,6 @@
#if PLATFORM(COCOA)
bool kill();
- void terminateSoon(double intervalInSeconds);
#endif
private:
Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (169383 => 169384)
--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-05-27 16:25:56 UTC (rev 169383)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-05-27 16:30:50 UTC (rev 169384)
@@ -36,10 +36,6 @@
#include <wtf/RunLoop.h>
#include <xpc/xpc.h>
-#if PLATFORM(IOS)
-#include "ProcessAssertion.h"
-#endif
-
#if __has_include(<xpc/private.h>)
#include <xpc/private.h>
#else
@@ -69,41 +65,6 @@
MessageBodyIsOutOfLine = 1 << 0
};
-// ConnectionTerminationWatchdog does two things:
-// 1) It sets a watchdog timer to kill the peered process.
-// 2) On iOS, make the process runnable for the duration of the watchdog
-// to ensure it has a chance to terminate cleanly.
-class ConnectionTerminationWatchdog {
-public:
- static void createConnectionTerminationWatchdog(XPCPtr<xpc_connection_t>& xpcConnection, double intervalInSeconds)
- {
- new ConnectionTerminationWatchdog(xpcConnection, intervalInSeconds);
- }
-
-private:
- ConnectionTerminationWatchdog(XPCPtr<xpc_connection_t>& xpcConnection, double intervalInSeconds)
- : m_xpcConnection(xpcConnection)
- , m_watchdogTimer(RunLoop::main(), this, &ConnectionTerminationWatchdog::watchdogTimerFired)
-#if PLATFORM(IOS)
- , m_assertion(std::make_unique<WebKit::ProcessAssertion>(xpc_connection_get_pid(m_xpcConnection.get()), WebKit::AssertionState::Background))
-#endif
- {
- m_watchdogTimer.startOneShot(intervalInSeconds);
- }
-
- void watchdogTimerFired()
- {
- xpc_connection_kill(m_xpcConnection.get(), SIGKILL);
- delete this;
- }
-
- XPCPtr<xpc_connection_t> m_xpcConnection;
- RunLoop::Timer<ConnectionTerminationWatchdog> m_watchdogTimer;
-#if PLATFORM(IOS)
- std::unique_ptr<WebKit::ProcessAssertion> m_assertion;
-#endif
-};
-
void Connection::platformInvalidate()
{
if (!m_isConnected)
@@ -136,13 +97,7 @@
m_xpcConnection = nullptr;
}
-
-void Connection::terminateSoon(double intervalInSeconds)
-{
- if (m_xpcConnection)
- ConnectionTerminationWatchdog::createConnectionTerminationWatchdog(m_xpcConnection, intervalInSeconds);
-}
-
+
void Connection::platformInitialize(Identifier identifier)
{
#if !PLATFORM(IOS)
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (169383 => 169384)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-05-27 16:25:56 UTC (rev 169383)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-05-27 16:30:50 UTC (rev 169384)
@@ -210,11 +210,6 @@
// We only allow this when using a network process, as otherwise the WebProcess needs to preserve its session state.
if (m_context->usesNetworkProcess() && canTerminateChildProcess()) {
abortProcessLaunchIfNeeded();
-#if PLATFORM(IOS)
- // On iOS deploy a watchdog in the UI process, since the content may be suspended.
- // 30s should be sufficient for any outstanding activity to complete cleanly.
- connection()->terminateSoon(30);
-#endif
disconnect();
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
