Changeset 247375 in webkit

Timestamp:

Jul 11, 2019 4:58:35 PM (5 years ago)

Author:

Chris Dumez

Message:

ASSERTION FAILED: RunLoop::isMain() under IPC::Connection::sendWithAsyncReply()
​https://bugs.webkit.org/show_bug.cgi?id=199734
<rdar://problem/52977439>

Reviewed by Geoffrey Garen.

It appears WKProcessTaskStateObserverDelegate's taskStateDidChange handler can get called
on a background thread so we need to make sure we go back to the main thread before we
go into WebKit and do IPC.

• Shared/Cocoa/ProcessTaskStateObserver.mm:

(-[WKProcessTaskStateObserverDelegate process:taskStateDidChange:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/Cocoa/ProcessTaskStateObserver.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-11  Chris Dumez  <cdumez@apple.com>
+
+        ASSERTION FAILED: RunLoop::isMain() under IPC::Connection::sendWithAsyncReply()
+        https://bugs.webkit.org/show_bug.cgi?id=199734
+        <rdar://problem/52977439>
+
+        Reviewed by Geoffrey Garen.
+
+        It appears WKProcessTaskStateObserverDelegate's taskStateDidChange handler can get called
+        on a background thread so we need to make sure we go back to the main thread before we
+        go into WebKit and do IPC.
+
+        * Shared/Cocoa/ProcessTaskStateObserver.mm:
+        (-[WKProcessTaskStateObserverDelegate process:taskStateDidChange:]):
+
 2019-07-11  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebKit/Shared/Cocoa/ProcessTaskStateObserver.mm

@@ -48 +48 @@
     RELEASE_LOG(ProcessSuspension, "%p -[WKProcessTaskStateObserverDelegate process:taskStateDidChange:], process(%p), newState(%d)", self, process, (int)newState);
 
-    if (self.taskStateChangedCallback)
-        self.taskStateChangedCallback(newState);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.taskStateChangedCallback)
+            self.taskStateChangedCallback(newState);
+    });
 }
 @end