Changeset 277351 in webkit

Timestamp:

May 11, 2021, 8:40:45 PM (5 years ago)

Author:

Simon Fraser

Message:

Crash in DisplayLink::incrementFullSpeedRequestClientCount()
​https://bugs.webkit.org/show_bug.cgi?id=225683
<rdar://77716330>

Reviewed by Tim Horton.

Crash data suggest that in WebPageProxy::updateWheelEventActivityAfterProcessSwap()
the connection might be null. Protect against that an an unset DisplayID, as we do
in wheelEventHysteresisUpdated().

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::updateWheelEventActivityAfterProcessSwap):

• UIProcess/mac/DisplayLink.cpp:

(WebKit::DisplayLink::incrementFullSpeedRequestClientCount): Remove an extra semicolon.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/mac/DisplayLink.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Crash in DisplayLink::incrementFullSpeedRequestClientCount()
+        https://bugs.webkit.org/show_bug.cgi?id=225683
+        <rdar://77716330>
+
+        Reviewed by Tim Horton.
+
+        Crash data suggest that in WebPageProxy::updateWheelEventActivityAfterProcessSwap()
+        the connection might be null. Protect against that an an unset DisplayID, as we do
+        in wheelEventHysteresisUpdated().
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::updateWheelEventActivityAfterProcessSwap):
+        * UIProcess/mac/DisplayLink.cpp:
+        (WebKit::DisplayLink::incrementFullSpeedRequestClientCount): Remove an extra semicolon.
+
 2021-05-11  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -2783 +2783 @@
 #if HAVE(CVDISPLAYLINK)
     if (m_wheelEventActivityHysteresis.state() == PAL::HysteresisState::Started) {
+        if (!m_process->hasConnection() || !m_displayID)
+            return;
+
         bool wantsFullSpeedUpdates = true;
         process().processPool().setDisplayLinkForDisplayWantsFullSpeedUpdates(*m_process->connection(), *m_displayID, wantsFullSpeedUpdates);

trunk/Source/WebKit/UIProcess/mac/DisplayLink.cpp

@@ -161 +161 @@
     auto& connectionInfo = m_observers.ensure(&connection, [] {
         return ConnectionClientInfo { };
-    }).iterator->value;;
+    }).iterator->value;
 
     ++connectionInfo.fullSpeedUpdatesClientCount;