- Revision
- 275327
- Author
- [email protected]
- Date
- 2021-03-31 17:39:46 -0700 (Wed, 31 Mar 2021)
Log Message
Use MACH_PORT_VALID() when wanting to check if a mach port is valid
https://bugs.webkit.org/show_bug.cgi?id=224004
Reviewed by Darin Adler.
Use MACH_PORT_VALID() when wanting to check if a mach port is valid, instead of checking for
MACH_PORT_NULL. MACH_PORT_VALID() is the correct way to check for validity since it also checks
for the MACH_PORT_DEAD value.
Source/WebCore:
* page/cocoa/ResourceUsageThreadCocoa.mm:
(WebCore::ResourceUsageThread::platformCollectCPUData):
* platform/graphics/mac/GraphicsChecksMac.cpp:
(WebCore::attachToAppleGraphicsControl):
(WebCore::hasMuxCapability):
Source/WebKitLegacy/mac:
* Plugins/Hosted/NetscapePluginHostManager.mm:
(WebKit::NetscapePluginHostManager::spawnPluginHost):
* Plugins/Hosted/NetscapePluginHostProxy.mm:
(WebKit::NetscapePluginHostProxy::processRequests):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (275326 => 275327)
--- trunk/Source/WebCore/ChangeLog 2021-04-01 00:33:29 UTC (rev 275326)
+++ trunk/Source/WebCore/ChangeLog 2021-04-01 00:39:46 UTC (rev 275327)
@@ -1,3 +1,20 @@
+2021-03-31 Chris Dumez <[email protected]>
+
+ Use MACH_PORT_VALID() when wanting to check if a mach port is valid
+ https://bugs.webkit.org/show_bug.cgi?id=224004
+
+ Reviewed by Darin Adler.
+
+ Use MACH_PORT_VALID() when wanting to check if a mach port is valid, instead of checking for
+ MACH_PORT_NULL. MACH_PORT_VALID() is the correct way to check for validity since it also checks
+ for the MACH_PORT_DEAD value.
+
+ * page/cocoa/ResourceUsageThreadCocoa.mm:
+ (WebCore::ResourceUsageThread::platformCollectCPUData):
+ * platform/graphics/mac/GraphicsChecksMac.cpp:
+ (WebCore::attachToAppleGraphicsControl):
+ (WebCore::hasMuxCapability):
+
2021-03-31 Cameron McCormack <[email protected]>
Avoid creating any complex text runs when font-size is zero.
Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm (275326 => 275327)
--- trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm 2021-04-01 00:33:29 UTC (rev 275326)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm 2021-04-01 00:39:46 UTC (rev 275327)
@@ -164,7 +164,7 @@
auto locker = holdLock(Thread::allThreadsMutex());
for (auto* thread : Thread::allThreads(locker)) {
mach_port_t machThread = thread->machThread();
- if (machThread != MACH_PORT_NULL)
+ if (MACH_PORT_VALID(machThread))
knownWebKitThreads.add(machThread);
}
}
@@ -177,7 +177,7 @@
if (!thread->thread())
continue;
mach_port_t machThread = thread->thread()->machThread();
- if (machThread != MACH_PORT_NULL)
+ if (MACH_PORT_VALID(machThread))
knownWorkerThreads.set(machThread, thread->identifier().isolatedCopy());
}
}
Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsChecksMac.cpp (275326 => 275327)
--- trunk/Source/WebCore/platform/graphics/mac/GraphicsChecksMac.cpp 2021-04-01 00:33:29 UTC (rev 275326)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsChecksMac.cpp 2021-04-01 00:39:46 UTC (rev 275327)
@@ -46,21 +46,21 @@
mach_port_t masterPort = MACH_PORT_NULL;
if (IOMasterPort(MACH_PORT_NULL, &masterPort) != KERN_SUCCESS)
- return MACH_PORT_NULL;
+ return IO_OBJECT_NULL;
CFDictionaryRef classToMatch = IOServiceMatching("AppleGraphicsControl");
if (!classToMatch)
- return MACH_PORT_NULL;
+ return IO_OBJECT_NULL;
kern_return_t kernResult;
io_iterator_t iterator;
if ((kernResult = IOServiceGetMatchingServices(masterPort, classToMatch, &iterator)) != KERN_SUCCESS)
- return MACH_PORT_NULL;
+ return IO_OBJECT_NULL;
io_service_t serviceObject = IOIteratorNext(iterator);
IOObjectRelease(iterator);
if (!serviceObject)
- return MACH_PORT_NULL;
+ return IO_OBJECT_NULL;
io_connect_t dataPort;
IOObjectRetain(serviceObject);
@@ -67,7 +67,7 @@
kernResult = IOServiceOpen(serviceObject, mach_task_self(), 0, &dataPort);
IOObjectRelease(serviceObject);
- return (kernResult == KERN_SUCCESS) ? dataPort : MACH_PORT_NULL;
+ return (kernResult == KERN_SUCCESS) ? dataPort : IO_OBJECT_NULL;
}
static bool hasMuxCapability()
@@ -74,7 +74,7 @@
{
io_connect_t dataPort = attachToAppleGraphicsControl();
- if (dataPort == MACH_PORT_NULL)
+ if (dataPort == IO_OBJECT_NULL)
return false;
bool result;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (275326 => 275327)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-04-01 00:33:29 UTC (rev 275326)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-04-01 00:39:46 UTC (rev 275327)
@@ -1,3 +1,19 @@
+2021-03-31 Chris Dumez <[email protected]>
+
+ Use MACH_PORT_VALID() when wanting to check if a mach port is valid
+ https://bugs.webkit.org/show_bug.cgi?id=224004
+
+ Reviewed by Darin Adler.
+
+ Use MACH_PORT_VALID() when wanting to check if a mach port is valid, instead of checking for
+ MACH_PORT_NULL. MACH_PORT_VALID() is the correct way to check for validity since it also checks
+ for the MACH_PORT_DEAD value.
+
+ * Plugins/Hosted/NetscapePluginHostManager.mm:
+ (WebKit::NetscapePluginHostManager::spawnPluginHost):
+ * Plugins/Hosted/NetscapePluginHostProxy.mm:
+ (WebKit::NetscapePluginHostProxy::processRequests):
+
2021-03-28 Sam Weinig <[email protected]>
Remove ENABLE_INDEXED_DATABASE & ENABLE_INDEXED_DATABASE_IN_WORKERS, it seems like it is on for all ports
Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm (275326 => 275327)
--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2021-04-01 00:33:29 UTC (rev 275326)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostManager.mm 2021-04-01 00:39:46 UTC (rev 275327)
@@ -135,7 +135,7 @@
return MACH_PORT_NULL;
mach_port_t renderServerPort = CARenderServerGetPort();
- if (renderServerPort == MACH_PORT_NULL)
+ if (!MACH_PORT_VALID(renderServerPort))
return false;
NSString *pluginHostAppPath = [[NSBundle bundleForClass:[WebNetscapePluginPackage class]] pathForAuxiliaryExecutable:pluginHostAppName];
Modified: trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostProxy.mm (275326 => 275327)
--- trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2021-04-01 00:33:29 UTC (rev 275326)
+++ trunk/Source/WebKitLegacy/mac/Plugins/Hosted/NetscapePluginHostProxy.mm 2021-04-01 00:39:46 UTC (rev 275327)
@@ -312,7 +312,7 @@
__ReplyUnion__WKWebKitPluginClient_subsystem reply;
mach_msg_header_t* replyHeader = reinterpret_cast<mach_msg_header_t*>(&reply);
- if (WebKitPluginClient_server(msg, replyHeader) && replyHeader->msgh_remote_port != MACH_PORT_NULL) {
+ if (WebKitPluginClient_server(msg, replyHeader) && MACH_PORT_VALID(replyHeader->msgh_remote_port)) {
kr = mach_msg(replyHeader, MACH_SEND_MSG, replyHeader->msgh_size, 0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
if (kr != KERN_SUCCESS) {
