Skip to content
Permalink
Browse files
Web Inspector: Error when closing page with WebInspector open
https://bugs.webkit.org/show_bug.cgi?id=152867
rdar://problem/24099423

Reviewed by Brian Burg.

* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::didClose): Null out m_inspectorPage after platformDetach(),
so the views can be cleaned up correctly.


Canonical link: https://commits.webkit.org/172015@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196183 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
xeenon committed Feb 5, 2016
1 parent 2e955c8 commit 004b71bc9386dda3d0bdbc482e2e5a900196fc9c
Showing with 17 additions and 1 deletion.
  1. +12 −0 Source/WebKit2/ChangeLog
  2. +5 −1 Source/WebKit2/UIProcess/WebInspectorProxy.cpp
@@ -1,3 +1,15 @@
2016-02-05 Timothy Hatcher <timothy@apple.com>

Web Inspector: Error when closing page with WebInspector open
https://bugs.webkit.org/show_bug.cgi?id=152867
rdar://problem/24099423

Reviewed by Brian Burg.

* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::didClose): Null out m_inspectorPage after platformDetach(),
so the views can be cleaned up correctly.

2016-02-05 Alex Christensen <achristensen@webkit.org>

Move NetworkDataTask to its own header and source files
@@ -572,7 +572,6 @@ void WebInspectorProxy::didClose()
return;

m_inspectorPage->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID());
m_inspectorPage = nullptr;

m_isVisible = false;
m_isProfilingPage = false;
@@ -581,9 +580,14 @@ void WebInspectorProxy::didClose()

if (m_isAttached)
platformDetach();

// Null out m_inspectorPage after platformDetach(), so the views can be cleaned up correctly.
m_inspectorPage = nullptr;

m_isAttached = false;
m_canAttach = false;
m_underTest = false;

m_connectionIdentifier = IPC::Attachment();

platformDidClose();

0 comments on commit 004b71b

Please sign in to comment.