Changeset 239196 in webkit

Timestamp:

Dec 13, 2018 8:09:59 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS] Web Inspector: Occasional UIProcess crashes under WebPageProxy::showInspectorIndication
​https://bugs.webkit.org/show_bug.cgi?id=192689
<rdar://problem/46323610>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2018-12-13
Reviewed by Simon Fraser.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::close):

• UIProcess/WebPageProxy.h:

Don't wait until ~WebPageProxy to destroy the WebPageProxyDebuggable
which broadcasts it as a remote inspector target. Terminate this
as soon as the WebPageProxy closes and becomes invalid.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-13  Joseph Pecoraro  <pecoraro@apple.com>
+
+        [iOS] Web Inspector: Occasional UIProcess crashes under WebPageProxy::showInspectorIndication
+        https://bugs.webkit.org/show_bug.cgi?id=192689
+        <rdar://problem/46323610>
+
+        Reviewed by Simon Fraser.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::close):
+        * UIProcess/WebPageProxy.h:
+        Don't wait until ~WebPageProxy to destroy the WebPageProxyDebuggable
+        which broadcasts it as a remote inspector target. Terminate this
+        as soon as the WebPageProxy closes and becomes invalid.
+
 2018-12-13  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -959 +959 @@
     m_backForwardList->pageClosed();
     m_inspectorController->pageClosed();
+#if ENABLE(REMOTE_INSPECTOR)
+    m_inspectorDebuggable = nullptr;
+#endif
     pageClient().pageClosed();
 

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -2296 +2296 @@
     const std::unique_ptr<WebPageInspectorController> m_inspectorController;
 #if ENABLE(REMOTE_INSPECTOR)
-    const std::unique_ptr<WebPageDebuggable> m_inspectorDebuggable;
+    std::unique_ptr<WebPageDebuggable> m_inspectorDebuggable;
 #endif