Title: [183121] trunk/Source/WebKit2
- Revision
- 183121
- Author
- [email protected]
- Date
- 2015-04-22 12:02:06 -0700 (Wed, 22 Apr 2015)
Log Message
[Mac] In nightlies and local builds, WebKit services can get terminated under memory pressure
https://bugs.webkit.org/show_bug.cgi?id=144052
rdar://problem/19754404
Reviewed by Darin Adler.
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
(main): Make XPC transaction tracking work again after a re-exec.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (183120 => 183121)
--- trunk/Source/WebKit2/ChangeLog 2015-04-22 19:01:37 UTC (rev 183120)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-22 19:02:06 UTC (rev 183121)
@@ -1,3 +1,14 @@
+2015-04-22 Alexey Proskuryakov <[email protected]>
+
+ [Mac] In nightlies and local builds, WebKit services can get terminated under memory pressure
+ https://bugs.webkit.org/show_bug.cgi?id=144052
+ rdar://problem/19754404
+
+ Reviewed by Darin Adler.
+
+ * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
+ (main): Make XPC transaction tracking work again after a re-exec.
+
2015-04-22 Zan Dobersek <[email protected]>
[WK2] Have API::Array creation methods return Ref<>
Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm (183120 => 183121)
--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2015-04-22 19:01:37 UTC (rev 183120)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm 2015-04-22 19:02:06 UTC (rev 183121)
@@ -159,6 +159,14 @@
int main(int argc, char** argv)
{
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ // Workaround for <rdar://problem/20653234>, make XPC transactions work after re-exec.
+ xpc_track_activity();
+#pragma clang diagnostic pop
+#endif
+
xpc_main(XPCServiceEventHandler);
return 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
