Changeset 272799 in webkit

Timestamp:

Feb 12, 2021, 12:25:53 PM (4 years ago)

Author:

dino@apple.com

Message:

Unexpected ASSERT when touch events are dispatched on the main thread
​https://bugs.webkit.org/show_bug.cgi?id=221832
<rdar://problem/74283856>

Reviewed by Sam Weinig.

The change in r272558 causes an ASSERT when running on iOS debug
builds. The touch event CompletionHandlers are created on the EventDispatcher
thread, but serviced on the main thread. We now need to state that this
is ok as we create the CompletionHandler.

This is covered by tests, but the EWS bots don't run iOS tests in
debug mode, and the internal bots hadn't caught up yet!

• Platform/IPC/HandleMessage.h:

(IPC::handleMessageAsync): Pass a CompletionHandlerCallThread into the constructor.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/IPC/HandleMessage.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-12  Dean Jackson  <dino@apple.com>
+
+        Unexpected ASSERT when touch events are dispatched on the main thread
+        https://bugs.webkit.org/show_bug.cgi?id=221832
+        <rdar://problem/74283856>
+
+        Reviewed by Sam Weinig.
+
+        The change in r272558 causes an ASSERT when running on iOS debug
+        builds. The touch event CompletionHandlers are created on the EventDispatcher
+        thread, but serviced on the main thread. We now need to state that this
+        is ok as we create the CompletionHandler.
+
+        This is covered by tests, but the EWS bots don't run iOS tests in
+        debug mode, and the internal bots hadn't caught up yet!
+
+        * Platform/IPC/HandleMessage.h:
+        (IPC::handleMessageAsync): Pass a CompletionHandlerCallThread into the constructor.
+
 2021-02-12  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/Platform/IPC/HandleMessage.h

@@ -182 +182 @@
     }
 
-    typename T::AsyncReply completionHandler = [listenerID = *listenerID, connection = makeRef(connection)] (auto&&... args) mutable {
+    typename T::AsyncReply completionHandler = { [listenerID = *listenerID, connection = makeRef(connection)] (auto&&... args) mutable {
         auto encoder = makeUnique<Encoder>(T::asyncMessageReplyName(), listenerID);
         T::send(WTFMove(encoder), WTFMove(connection), args...);
-    };
+    }, CompletionHandlerCallThread::MainThread };
     callMemberFunction(WTFMove(*arguments), WTFMove(completionHandler), object, function);
 }