Title: [260781] trunk/Source/WebKit
- Revision
- 260781
- Author
- [email protected]
- Date
- 2020-04-27 14:04:52 -0700 (Mon, 27 Apr 2020)
Log Message
REGRESSION (r219050): Remove more code only needed for building with OS X Yosemite
<https://webkit.org/b/211088>
<rdar://problem/62452487>
Reviewed by Chris Dumez.
* Platform/IPC/cocoa/ConnectionCocoa.mm:
(IPC::Connection::receiveSourceEventHandler):
* Platform/mac/MachUtilities.cpp:
(setMachPortQueueLength):
(machExceptionPort): Deleted.
(setMachExceptionPort): Deleted.
* Platform/mac/MachUtilities.h:
- Delete unused code.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (260780 => 260781)
--- trunk/Source/WebKit/ChangeLog 2020-04-27 20:56:01 UTC (rev 260780)
+++ trunk/Source/WebKit/ChangeLog 2020-04-27 21:04:52 UTC (rev 260781)
@@ -1,3 +1,20 @@
+2020-04-27 David Kilzer <[email protected]>
+
+ REGRESSION (r219050): Remove more code only needed for building with OS X Yosemite
+ <https://webkit.org/b/211088>
+ <rdar://problem/62452487>
+
+ Reviewed by Chris Dumez.
+
+ * Platform/IPC/cocoa/ConnectionCocoa.mm:
+ (IPC::Connection::receiveSourceEventHandler):
+ * Platform/mac/MachUtilities.cpp:
+ (setMachPortQueueLength):
+ (machExceptionPort): Deleted.
+ (setMachExceptionPort): Deleted.
+ * Platform/mac/MachUtilities.h:
+ - Delete unused code.
+
2020-04-27 Per Arne Vollan <[email protected]>
[Cocoa] After r258891, r255119 can be reverted
Modified: trunk/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm (260780 => 260781)
--- trunk/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm 2020-04-27 20:56:01 UTC (rev 260780)
+++ trunk/Source/WebKit/Platform/IPC/cocoa/ConnectionCocoa.mm 2020-04-27 21:04:52 UTC (rev 260781)
@@ -571,29 +571,6 @@
return;
}
-#if !PLATFORM(IOS_FAMILY)
- if (decoder->messageReceiverName() == "IPC" && decoder->messageName() == "SetExceptionPort") {
- if (m_isServer) {
- // Server connections aren't supposed to have their exception ports overridden. Treat this as an invalid message.
- StringReference messageReceiverNameReference = decoder->messageReceiverName();
- String messageReceiverName(String(messageReceiverNameReference.data(), messageReceiverNameReference.size()));
- StringReference messageNameReference = decoder->messageName();
- String messageName(String(messageNameReference.data(), messageNameReference.size()));
-
- RunLoop::main().dispatch([protectedThis = makeRef(*this), messageReceiverName = WTFMove(messageReceiverName), messageName = WTFMove(messageName)]() mutable {
- protectedThis->dispatchDidReceiveInvalidMessage(messageReceiverName.utf8(), messageName.utf8());
- });
- return;
- }
- MachPort exceptionPort;
- if (!decoder->decode(exceptionPort))
- return;
-
- setMachExceptionPort(exceptionPort.port());
- return;
- }
-#endif
-
processIncomingMessage(WTFMove(decoder));
}
Modified: trunk/Source/WebKit/Platform/mac/MachUtilities.cpp (260780 => 260781)
--- trunk/Source/WebKit/Platform/mac/MachUtilities.cpp 2020-04-27 20:56:01 UTC (rev 260780)
+++ trunk/Source/WebKit/Platform/mac/MachUtilities.cpp 2020-04-27 21:04:52 UTC (rev 260781)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -26,7 +26,6 @@
#include "config.h"
#include "MachUtilities.h"
-#include <mach/mach_init.h>
#include <mach/task.h>
void setMachPortQueueLength(mach_port_t receivePort, mach_port_msgcount_t queueLength)
@@ -38,36 +37,3 @@
mach_port_set_attributes(mach_task_self(), receivePort, MACH_PORT_LIMITS_INFO, reinterpret_cast<mach_port_info_t>(&portLimits), MACH_PORT_LIMITS_INFO_COUNT);
}
-
-mach_port_t machExceptionPort()
-{
- exception_mask_t exceptionMasks[EXC_TYPES_COUNT];
- exception_port_t exceptionHandlers[EXC_TYPES_COUNT];
- exception_behavior_t exceptionBehaviors[EXC_TYPES_COUNT];
- thread_state_flavor_t exceptionFlavors[EXC_TYPES_COUNT];
- mach_msg_type_number_t numExceptionMasks;
-
- kern_return_t kr = task_get_exception_ports(mach_task_self(), EXC_MASK_CRASH, exceptionMasks, &numExceptionMasks, exceptionHandlers, exceptionBehaviors, exceptionFlavors);
- if (kr != KERN_SUCCESS) {
- ASSERT_NOT_REACHED();
- return MACH_PORT_NULL;
- }
-
- // We're just interested in the first exception handler.
- return exceptionHandlers[0];
-}
-
-void setMachExceptionPort(mach_port_t exceptionPort)
-{
- ASSERT(MACH_PORT_VALID(exceptionPort));
-
- // Assert that we dont try to call setMachExceptionPort more than once per process.
-#if ASSERT_ENABLED
- static mach_port_t taskExceptionPort = MACH_PORT_NULL;
- ASSERT(taskExceptionPort == MACH_PORT_NULL);
- taskExceptionPort = exceptionPort;
-#endif
-
- if (task_set_exception_ports(mach_task_self(), EXC_MASK_CRASH, exceptionPort, EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES, MACHINE_THREAD_STATE) != KERN_SUCCESS)
- ASSERT_NOT_REACHED();
-}
Modified: trunk/Source/WebKit/Platform/mac/MachUtilities.h (260780 => 260781)
--- trunk/Source/WebKit/Platform/mac/MachUtilities.h 2020-04-27 20:56:01 UTC (rev 260780)
+++ trunk/Source/WebKit/Platform/mac/MachUtilities.h 2020-04-27 21:04:52 UTC (rev 260781)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,7 +30,4 @@
void setMachPortQueueLength(mach_port_t, mach_port_msgcount_t queueLength);
-mach_port_t machExceptionPort();
-void setMachExceptionPort(mach_port_t exceptionPort);
-
#endif // MachUtilities_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
