Attachment 357288 Details for Bug 192689 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

here-goes-1.patch (text/plain), 1.96 KB, created by Joseph Pecoraro on 2018-12-13 19:36:45 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2018-12-13 19:36:45 PST

Size: 1.96 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index c20bb57f893..09f36e1faf1 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        * 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>
> 
>         [PSON] We should not need to navigate to 'about:blank' to suspend pages
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index 358db6fc24e..04b038ee2cf 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -958,6 +958,9 @@ void WebPageProxy::close()
> 
>     m_backForwardList->pageClosed();
>     m_inspectorController->pageClosed();
>+#if ENABLE(REMOTE_INSPECTOR)
>+    m_inspectorDebuggable = nullptr;
>+#endif
>     pageClient().pageClosed();
> 
>     m_process->disconnectFramesFromPage(this);
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index 3dfd653203c..d96473e8932 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -2295,7 +2295,7 @@ private:
> 
>     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
> 
>     std::optional<SpellDocumentTag> m_spellDocumentTag;

Actions: View | Formatted Diff | Diff

Attachments on bug 192689: 357288