Changeset 277344 in webkit

Timestamp:

May 11, 2021, 5:05:49 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Remove xpc_connection_kill
​https://bugs.webkit.org/show_bug.cgi?id=225602

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-05-11
Reviewed by Alexey Proskuryakov.

Source/WebKit:

• UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::terminateWithReason):

Source/WTF:

• wtf/PlatformHave.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-05-11  Alex Christensen  <achristensen@webkit.org>
+
+        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  <cdumez@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -963 +963 @@
 #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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-11  Alex Christensen  <achristensen@webkit.org>
+
+        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  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm

@@ -344 +344 @@
 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);
@@ -351 +353 @@
     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
 }