Changeset 276153 in webkit

Timestamp:

Apr 16, 2021, 12:20:07 PM (5 years ago)

Author:

Chris Dumez

Message:

Unreviewed, reverting r275839.

The new release assertion is hitting to easily in client apps

Reverted changeset:

"Make sure AuxiliaryProcessProxy::sendMessage() is called on
the main thread"
​https://bugs.webkit.org/show_bug.cgi?id=224448
​https://commits.webkit.org/r275839

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/AuxiliaryProcessProxy.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-16  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, reverting r275839.
+
+        The new release assertion is hitting to easily in client apps
+
+        Reverted changeset:
+
+        "Make sure AuxiliaryProcessProxy::sendMessage() is called on
+        the main thread"
+        https://bugs.webkit.org/show_bug.cgi?id=224448
+        https://commits.webkit.org/r275839
+
 2021-04-16  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/AuxiliaryProcessProxy.cpp

@@ -161 +161 @@
 bool AuxiliaryProcessProxy::sendMessage(UniqueRef<IPC::Encoder>&& encoder, OptionSet<IPC::SendOption> sendOptions, Optional<std::pair<CompletionHandler<void(IPC::Decoder*)>, uint64_t>>&& asyncReplyInfo, ShouldStartProcessThrottlerActivity shouldStartProcessThrottlerActivity)
 {
-    RELEASE_ASSERT(isMainRunLoop());
+    // FIXME: We should turn this into a RELEASE_ASSERT().
+    ASSERT(isMainRunLoop());
+    if (!isMainRunLoop()) {
+        callOnMainRunLoop([protectedThis = makeRef(*this), encoder = WTFMove(encoder), sendOptions, asyncReplyInfo = WTFMove(asyncReplyInfo), shouldStartProcessThrottlerActivity]() mutable {
+            protectedThis->sendMessage(WTFMove(encoder), sendOptions, WTFMove(asyncReplyInfo), shouldStartProcessThrottlerActivity);
+        });
+        return true;
+    }
 
     if (asyncReplyInfo && canSendMessage() && shouldStartProcessThrottlerActivity == ShouldStartProcessThrottlerActivity::Yes) {
@@ -229 +236 @@
 {
     ASSERT(!m_connection);
-    RELEASE_ASSERT(isMainRunLoop());
+    ASSERT(isMainRunLoop());
 
     if (!IPC::Connection::identifierIsValid(connectionIdentifier))
@@ -250 +257 @@
 void AuxiliaryProcessProxy::replyToPendingMessages()
 {
-    RELEASE_ASSERT(isMainRunLoop());
+    ASSERT(isMainRunLoop());
     for (auto& pendingMessage : std::exchange(m_pendingMessages, { })) {
         if (pendingMessage.asyncReplyInfo)