Changeset 198157 in webkit

Timestamp:

Mar 14, 2016, 2:32:38 PM (10 years ago)

Author:

Simon Fraser

Message:

Fix crash when reloading a page using requestAnimationFrame on iOS
​https://bugs.webkit.org/show_bug.cgi?id=155465
rdar://problem/25100202

Reviewed by Tim Horton.

On iOS, it's possible for all clients for a DisplayRefreshMonitor
to be unregistered, but still get a subsequent displayDidRefresh() for that monitor.
In this case, we would remove(notFound) which release-asserts.

Fix by just checking for notFound.

Unable to test because requestAnimationFrame doesn't work in the simulator.

• platform/graphics/DisplayRefreshMonitorManager.cpp:

(WebCore::DisplayRefreshMonitorManager::displayDidRefresh):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-03-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix crash when reloading a page using requestAnimationFrame on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=155465
+        rdar://problem/25100202
+
+        Reviewed by Tim Horton.
+
+        On iOS, it's possible for all clients for a DisplayRefreshMonitor
+        to be unregistered, but still get a subsequent displayDidRefresh() for that monitor.
+        In this case, we would remove(notFound) which release-asserts.
+        
+        Fix by just checking for notFound.
+        
+        Unable to test because requestAnimationFrame doesn't work in the simulator.
+
+        * platform/graphics/DisplayRefreshMonitorManager.cpp:
+        (WebCore::DisplayRefreshMonitorManager::displayDidRefresh):
+
 2016-03-14  Per Arne Vollan  <peavo@outlook.com>
 

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

@@ -110 +110 @@
 
     size_t monitorIndex = m_monitors.find(&monitor);
-    ASSERT(monitorIndex != notFound);
-    m_monitors.remove(monitorIndex);
+    if (monitorIndex != notFound)
+        m_monitors.remove(monitorIndex);
 }