Title: [132425] trunk/Source/WebKit2
- Revision
- 132425
- Author
- [email protected]
- Date
- 2012-10-24 16:55:49 -0700 (Wed, 24 Oct 2012)
Log Message
Disable auto termination of WebKit2 processes on mac
https://bugs.webkit.org/show_bug.cgi?id=100176
Patch by Kiran Muppala <[email protected]> on 2012-10-24
Reviewed by Alexey Proskuryakov.
Disable WebKit2 auto termination by taking corresponding assertion
until UI process is enhanced to determine when it is safe to enable it.
* NetworkProcess/mac/NetworkProcessMainMac.mm:
(WebKit::NetworkProcessMain):
* PluginProcess/mac/PluginProcessMainMac.mm:
(WebKit::PluginProcessMain):
* SharedWorkerProcess/mac/SharedWorkerProcessMainMac.mm:
(WebKit::SharedWorkerProcessMain):
* WebProcess/mac/WebProcessInitialization.mm:
(WebKit::InitializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (132424 => 132425)
--- trunk/Source/WebKit2/ChangeLog 2012-10-24 23:49:54 UTC (rev 132424)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-24 23:55:49 UTC (rev 132425)
@@ -1,3 +1,22 @@
+2012-10-24 Kiran Muppala <[email protected]>
+
+ Disable auto termination of WebKit2 processes on mac
+ https://bugs.webkit.org/show_bug.cgi?id=100176
+
+ Reviewed by Alexey Proskuryakov.
+
+ Disable WebKit2 auto termination by taking corresponding assertion
+ until UI process is enhanced to determine when it is safe to enable it.
+
+ * NetworkProcess/mac/NetworkProcessMainMac.mm:
+ (WebKit::NetworkProcessMain):
+ * PluginProcess/mac/PluginProcessMainMac.mm:
+ (WebKit::PluginProcessMain):
+ * SharedWorkerProcess/mac/SharedWorkerProcessMainMac.mm:
+ (WebKit::SharedWorkerProcessMain):
+ * WebProcess/mac/WebProcessInitialization.mm:
+ (WebKit::InitializeWebProcess):
+
2012-10-24 Christophe Dumez <[email protected]>
[EFL][WK2] Get rid of Ewk_View private C API (Part 1)
Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMainMac.mm (132424 => 132425)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMainMac.mm 2012-10-24 23:49:54 UTC (rev 132424)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMainMac.mm 2012-10-24 23:55:49 UTC (rev 132425)
@@ -83,6 +83,10 @@
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ [[NSProcessInfo processInfo] disableAutomaticTermination:@"Disable NetworkProcess Auto Termination"];
+#endif
+
// Initialize the network process connection.
NetworkProcess::shared().initialize(CoreIPC::Connection::Identifier(serverPort), RunLoop::main());
Modified: trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm (132424 => 132425)
--- trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm 2012-10-24 23:49:54 UTC (rev 132424)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMainMac.mm 2012-10-24 23:55:49 UTC (rev 132425)
@@ -117,6 +117,10 @@
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ [[NSProcessInfo processInfo] disableAutomaticTermination:@"Disable PluginProcess Auto Termination"];
+#endif
+
#if defined(__i386__)
// Initialize the shim for 32-bit only.
PluginProcess::shared().initializeShim();
Modified: trunk/Source/WebKit2/SharedWorkerProcess/mac/SharedWorkerProcessMainMac.mm (132424 => 132425)
--- trunk/Source/WebKit2/SharedWorkerProcess/mac/SharedWorkerProcessMainMac.mm 2012-10-24 23:49:54 UTC (rev 132424)
+++ trunk/Source/WebKit2/SharedWorkerProcess/mac/SharedWorkerProcessMainMac.mm 2012-10-24 23:55:49 UTC (rev 132425)
@@ -96,6 +96,10 @@
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ [[NSProcessInfo processInfo] disableAutomaticTermination:@"Disable SharedWorkerProcess Auto Termination"];
+#endif
+
// Initialize the shared worker process connection.
SharedWorkerProcess::shared().initialize(CoreIPC::Connection::Identifier(serverPort), RunLoop::main());
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessInitialization.mm (132424 => 132425)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessInitialization.mm 2012-10-24 23:49:54 UTC (rev 132424)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessInitialization.mm 2012-10-24 23:55:49 UTC (rev 132425)
@@ -46,6 +46,10 @@
WTF::initializeMainThread();
RunLoop::initializeMainRunLoop();
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ [[NSProcessInfo processInfo] disableAutomaticTermination:@"Disable WebProcess Auto Termination"];
+#endif
+
WebProcess::shared().initializeShim();
WebProcess::shared().initializeSandbox(clientIdentifier);
WebProcess::shared().initialize(connectionIdentifier, RunLoop::main());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
