Changeset 295600 in webkit

Timestamp:

Jun 16, 2022 11:08:23 AM (2 years ago)

Author:

pvollan@apple.com

Message:

Handle display reconfiguration on main thread
​https://bugs.webkit.org/show_bug.cgi?id=241683
<rdar://83417447>

Reviewed by Simon Fraser.

It is not safe to handle this on a non main thread, since we send messages to the WebContent and GPU process.

• Source/WebKit/UIProcess/WebProcessPool.cpp:

(WebKit::displayReconfigurationCallBack):

Canonical link: ​https://commits.webkit.org/251605@main

File:

• trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (modified) (1 diff)

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -683 +683 @@
 static void displayReconfigurationCallBack(CGDirectDisplayID display, CGDisplayChangeSummaryFlags flags, void *userInfo)
 {
-    auto screenProperties = WebCore::collectScreenProperties();
-    for (auto& processPool : WebProcessPool::allProcessPools()) {
-        processPool->sendToAllProcesses(Messages::WebProcess::SetScreenProperties(screenProperties));
-        processPool->sendToAllProcesses(Messages::WebProcess::DisplayConfigurationChanged(display, flags));
-        if (auto gpuProcess = processPool->gpuProcess()) {
-            gpuProcess->displayConfigurationChanged(display, flags);
-            gpuProcess->setScreenProperties(screenProperties);
+    RunLoop::main().dispatch([display, flags]() {
+        auto screenProperties = WebCore::collectScreenProperties();
+        for (auto& processPool : WebProcessPool::allProcessPools()) {
+            processPool->sendToAllProcesses(Messages::WebProcess::SetScreenProperties(screenProperties));
+            processPool->sendToAllProcesses(Messages::WebProcess::DisplayConfigurationChanged(display, flags));
+            if (auto gpuProcess = processPool->gpuProcess()) {
+                gpuProcess->displayConfigurationChanged(display, flags);
+                gpuProcess->setScreenProperties(screenProperties);
+            }
         }
-    }
+    });
 }