Changeset 275839 in webkit

Timestamp:

Apr 12, 2021, 2:28:41 PM (5 years ago)

Author:

Chris Dumez

Message:

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

Reviewed by Geoffrey Garen.

Make sure AuxiliaryProcessProxy::sendMessage() is called on the main thread. This is a follow-up to
Bug 224377 but for trunk.

• UIProcess/AuxiliaryProcessProxy.cpp:

(WebKit::AuxiliaryProcessProxy::sendMessage):
(WebKit::AuxiliaryProcessProxy::didFinishLaunching):
(WebKit::AuxiliaryProcessProxy::replyToPendingMessages):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-12  Chris Dumez  <cdumez@apple.com>
+
+        Make sure AuxiliaryProcessProxy::sendMessage() is called on the main thread
+        https://bugs.webkit.org/show_bug.cgi?id=224448
+
+        Reviewed by Geoffrey Garen.
+
+        Make sure AuxiliaryProcessProxy::sendMessage() is called on the main thread. This is a follow-up to
+        Bug 224377 but for trunk.
+
+        * UIProcess/AuxiliaryProcessProxy.cpp:
+        (WebKit::AuxiliaryProcessProxy::sendMessage):
+        (WebKit::AuxiliaryProcessProxy::didFinishLaunching):
+        (WebKit::AuxiliaryProcessProxy::replyToPendingMessages):
+
 2021-04-12  Ada Chan  <ada.chan@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)
 {
-    // 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;
-    }
+    RELEASE_ASSERT(isMainRunLoop());
 
     if (asyncReplyInfo && canSendMessage() && shouldStartProcessThrottlerActivity == ShouldStartProcessThrottlerActivity::Yes) {
@@ -236 +229 @@
 {
     ASSERT(!m_connection);
-    ASSERT(isMainRunLoop());
+    RELEASE_ASSERT(isMainRunLoop());
 
     if (!IPC::Connection::identifierIsValid(connectionIdentifier))
@@ -257 +250 @@
 void AuxiliaryProcessProxy::replyToPendingMessages()
 {
-    ASSERT(isMainRunLoop());
+    RELEASE_ASSERT(isMainRunLoop());
     for (auto& pendingMessage : std::exchange(m_pendingMessages, { })) {
         if (pendingMessage.asyncReplyInfo)