Changeset 247459 in webkit

Timestamp:

Jul 15, 2019 4:06:58 PM (5 years ago)

Author:

Chris Dumez

Message:

Crash under DisplayRefreshMonitorManager::displayWasUpdated()
​https://bugs.webkit.org/show_bug.cgi?id=199808
<rdar://problem/53070144>

Reviewed by Geoffrey Garen.

Copy m_monitors before iterating over it because the calling displayLinkFired() on the
monitor may end up calling DisplayRefreshMonitorManager::displayDidRefresh() synchronously,
which removes the monitor from m_monitors.

• platform/graphics/DisplayRefreshMonitorManager.cpp:

(WebCore::DisplayRefreshMonitorManager::displayWasUpdated):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/DisplayRefreshMonitorManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-15  Chris Dumez  <cdumez@apple.com>
+
+        Crash under DisplayRefreshMonitorManager::displayWasUpdated()
+        https://bugs.webkit.org/show_bug.cgi?id=199808
+        <rdar://problem/53070144>
+
+        Reviewed by Geoffrey Garen.
+
+        Copy m_monitors before iterating over it because the calling displayLinkFired() on the
+        monitor may end up calling DisplayRefreshMonitorManager::displayDidRefresh() synchronously,
+        which removes the monitor from m_monitors.
+
+        * platform/graphics/DisplayRefreshMonitorManager.cpp:
+        (WebCore::DisplayRefreshMonitorManager::displayWasUpdated):
+
 2019-07-15  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.cpp

@@ -129 +129 @@
 void DisplayRefreshMonitorManager::displayWasUpdated(PlatformDisplayID displayID)
 {
-    for (const auto& monitorWrapper : m_monitors) {
-        auto& monitor = monitorWrapper.monitor;
+    Vector<RefPtr<DisplayRefreshMonitor>> monitors = WTF::map(m_monitors, [](auto& monitorWrapper) {
+        return monitorWrapper.monitor;
+    });
+    for (auto& monitor : monitors) {
         if (displayID == monitor->displayID() && monitor->hasRequestedRefreshCallback())
             monitor->displayLinkFired();