Changeset 271408 in webkit

Timestamp:

Jan 12, 2021, 11:05:02 AM (6 years ago)

Author:

Wenson Hsieh

Message:

ASSERTION FAILED: m_connection under WebKit::WebPageProxy::acceptsFirstMouse()
​https://bugs.webkit.org/show_bug.cgi?id=220545
<rdar://problem/73043854>

Reviewed by Tim Horton.

Avoid the assertion by making it safe to call WebPageProxy::messageSenderConnection in debug builds, in the
case where the web process is still launching.

• UIProcess/AuxiliaryProcessProxy.h:

(WebKit::AuxiliaryProcessProxy::hasConnection const):

Add a helper method that returns whether or not a process proxy has a non-null connection.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::messageSenderConnection const):

Use the above helper to avoid calling into AuxiliaryProcessProxy::connection() when the connection is null.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/AuxiliaryProcessProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-12  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        ASSERTION FAILED: m_connection under WebKit::WebPageProxy::acceptsFirstMouse()
+        https://bugs.webkit.org/show_bug.cgi?id=220545
+        <rdar://problem/73043854>
+
+        Reviewed by Tim Horton.
+
+        Avoid the assertion by making it safe to call `WebPageProxy::messageSenderConnection` in debug builds, in the
+        case where the web process is still launching.
+
+        * UIProcess/AuxiliaryProcessProxy.h:
+        (WebKit::AuxiliaryProcessProxy::hasConnection const):
+
+        Add a helper method that returns whether or not a process proxy has a non-null connection.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::messageSenderConnection const):
+
+        Use the above helper to avoid calling into `AuxiliaryProcessProxy::connection()` when the connection is null.
+
 2021-01-12  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/UIProcess/AuxiliaryProcessProxy.h

@@ -77 +77 @@
         return m_connection.get();
     }
+
+    bool hasConnection() const
+    {
+        return !!m_connection;
+    }
     
     bool hasConnection(const IPC::Connection& connection) const

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -6442 +6442 @@
 IPC::Connection* WebPageProxy::messageSenderConnection() const
 {
-    return m_process->connection();
+    return m_process->hasConnection() ? m_process->connection() : nullptr;
 }