Title: [277344] trunk/Source
- Revision
- 277344
- Author
- [email protected]
- Date
- 2021-05-11 17:05:49 -0700 (Tue, 11 May 2021)
Log Message
Remove xpc_connection_kill
https://bugs.webkit.org/show_bug.cgi?id=225602
Patch by Alex Christensen <[email protected]> on 2021-05-11
Reviewed by Alexey Proskuryakov.
Source/WebKit:
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::terminateWithReason):
Source/WTF:
* wtf/PlatformHave.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (277343 => 277344)
--- trunk/Source/WTF/ChangeLog 2021-05-11 23:41:22 UTC (rev 277343)
+++ trunk/Source/WTF/ChangeLog 2021-05-12 00:05:49 UTC (rev 277344)
@@ -1,3 +1,12 @@
+2021-05-11 Alex Christensen <[email protected]>
+
+ Remove xpc_connection_kill
+ https://bugs.webkit.org/show_bug.cgi?id=225602
+
+ Reviewed by Alexey Proskuryakov.
+
+ * wtf/PlatformHave.h:
+
2021-05-10 Chris Dumez <[email protected]>
[ macOS Release wk2 ] http/tests/cache-storage/cache-records-persistency.https.html is flaky crashing
Modified: trunk/Source/WTF/wtf/PlatformHave.h (277343 => 277344)
--- trunk/Source/WTF/wtf/PlatformHave.h 2021-05-11 23:41:22 UTC (rev 277343)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2021-05-12 00:05:49 UTC (rev 277344)
@@ -962,3 +962,7 @@
#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
#define HAVE_UIBLUREFFECT_STYLE_SYSTEM_MATERIAL 1
#endif
+
+#if PLATFORM(COCOA) && !(PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000)
+#define HAVE_SYSTEM_SANDBOXES_ALLOWING_TERMINATE_WITH_REASON 1
+#endif
Modified: trunk/Source/WebKit/ChangeLog (277343 => 277344)
--- trunk/Source/WebKit/ChangeLog 2021-05-11 23:41:22 UTC (rev 277343)
+++ trunk/Source/WebKit/ChangeLog 2021-05-12 00:05:49 UTC (rev 277344)
@@ -1,3 +1,13 @@
+2021-05-11 Alex Christensen <[email protected]>
+
+ Remove xpc_connection_kill
+ https://bugs.webkit.org/show_bug.cgi?id=225602
+
+ Reviewed by Alexey Proskuryakov.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::terminateWithReason):
+
2021-05-11 Chris Dumez <[email protected]>
Add SPI to suspend / resume a WKWebView
Modified: trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm (277343 => 277344)
--- trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2021-05-11 23:41:22 UTC (rev 277343)
+++ trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2021-05-12 00:05:49 UTC (rev 277344)
@@ -343,15 +343,15 @@
void terminateWithReason(xpc_connection_t connection, ReasonCode reasonCode, const char* reason)
{
-#if PLATFORM(MACCATALYST) || PLATFORM(IOS)
- // FIXME: Remove this once rdar://76601307 and rdar://76652763 are fixed.
+#if HAVE(SYSTEM_SANDBOXES_ALLOWING_TERMINATE_WITH_REASON)
+ terminate_with_reason(xpc_connection_get_pid(connection), OS_REASON_WEBKIT, static_cast<uint64_t>(reasonCode), reason, OS_REASON_FLAG_NO_CRASH_REPORT);
+#else
+ // We are keeping this code on iOS 14.5 because rdar://76601307 and rdar://76652763 are not fixed there.
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
xpc_connection_kill(connection, SIGKILL);
ALLOW_DEPRECATED_DECLARATIONS_END
UNUSED_PARAM(reasonCode);
UNUSED_PARAM(reason);
-#else
- terminate_with_reason(xpc_connection_get_pid(connection), OS_REASON_WEBKIT, static_cast<uint64_t>(reasonCode), reason, OS_REASON_FLAG_NO_CRASH_REPORT);
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
