Changeset 238369 in webkit

Timestamp:

Nov 18, 2018 11:29:15 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Regression(r238330) ProcessSwap.WebInspector API test is a flaky crash in debug
​https://bugs.webkit.org/show_bug.cgi?id=191812

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2018-11-18
Reviewed by Chris Dumez.

• WebProcess/WebPage/WebInspector.cpp:

(WebKit::WebInspector::setFrontendConnection):
It can be possible to receive a frontend connection multiple times
if another WebProcess opened the inspector and this WebProcess got
swapped in before the InspectorProcess notified the WebProcess of
a connection to use. It is always best to use the latest connection
we have received, since any others would have been invalidated.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebInspector.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Regression(r238330) ProcessSwap.WebInspector API test is a flaky crash in debug
+        https://bugs.webkit.org/show_bug.cgi?id=191812
+
+        Reviewed by Chris Dumez.
+
+        * WebProcess/WebPage/WebInspector.cpp:
+        (WebKit::WebInspector::setFrontendConnection):
+        It can be possible to receive a frontend connection multiple times
+        if another WebProcess opened the inspector and this WebProcess got
+        swapped in before the InspectorProcess notified the WebProcess of
+        a connection to use. It is always best to use the latest connection
+        we have received, since any others would have been invalidated.
+
 2018-11-18  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp

@@ -78 +78 @@
 void WebInspector::setFrontendConnection(IPC::Attachment encodedConnectionIdentifier)
 {
-    ASSERT(!m_frontendConnection);
+    // We might receive multiple updates if this web process got swapped into a WebPageProxy
+    // shortly after another process established the connection.
+    if (m_frontendConnection) {
+        m_frontendConnection->invalidate();
+        m_frontendConnection = nullptr;
+    }
 
 #if USE(UNIX_DOMAIN_SOCKETS)