Changeset 263636 in webkit

Timestamp:

Jun 28, 2020 2:34:20 PM (4 years ago)

Author:

Chris Dumez

Message:

Fix thread-safety issue in webProcessPoolHighDynamicRangeDidChangeCallback()
​https://bugs.webkit.org/show_bug.cgi?id=213689
<rdar://problem/64443996>

Reviewed by Darin Adler.

webProcessPoolHighDynamicRangeDidChangeCallback() gets called on a background thread so we
need to make sure we dispatch to the main thread before we iterate over the process pools.

• UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::webProcessPoolHighDynamicRangeDidChangeCallback):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-06-28  Chris Dumez  <cdumez@apple.com>
+
+        Fix thread-safety issue in webProcessPoolHighDynamicRangeDidChangeCallback()
+        https://bugs.webkit.org/show_bug.cgi?id=213689
+        <rdar://problem/64443996>
+
+        Reviewed by Darin Adler.
+
+        webProcessPoolHighDynamicRangeDidChangeCallback() gets called on a background thread so we
+        need to make sure we dispatch to the main thread before we iterate over the process pools.
+
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::webProcessPoolHighDynamicRangeDidChangeCallback):
+
 2020-06-28  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -904 +904 @@
 static void webProcessPoolHighDynamicRangeDidChangeCallback(CMNotificationCenterRef, const void*, CFStringRef notificationName, const void*, CFTypeRef)
 {
-    auto screenProperties = WebCore::collectScreenProperties();
-    for (auto& processPool : WebProcessPool::allProcessPools())
-        processPool->sendToAllProcesses(Messages::WebProcess::SetScreenProperties(screenProperties));
+    dispatch_async(dispatch_get_main_queue(), ^{
+        auto properties = WebCore::collectScreenProperties();
+        for (auto& pool : WebProcessPool::allProcessPools())
+            pool->sendToAllProcesses(Messages::WebProcess::SetScreenProperties(properties));
+    });
 }