Unreviewed, rolling out r194544.

https://bugs.webkit.org/show_bug.cgi?id=152711

This change caused assertions in existing inspector tests
(Requested by ryanhaddad on #webkit).

Reverted changeset:

"Web Inspector: reproducible debug ASSERT when inspecting the
inspector (WK2)"
https://bugs.webkit.org/show_bug.cgi?id=152080
http://trac.webkit.org/changeset/194544

Canonical link: https://commits.webkit.org/170790@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog

@@ -1,3 +1,18 @@
+2016-01-04  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r194544.
+        https://bugs.webkit.org/show_bug.cgi?id=152711
+
+        This change caused assertions in existing inspector tests
+        (Requested by ryanhaddad on #webkit).
+
+        Reverted changeset:
+
+        "Web Inspector: reproducible debug ASSERT when inspecting the
+        inspector (WK2)"
+        https://bugs.webkit.org/show_bug.cgi?id=152080
+        http://trac.webkit.org/changeset/194544
+
 2016-01-04  Alex Christensen  <achristensen@webkit.org>
 
         Fix Mac CMake build after r194378.

Source/WebKit2/UIProcess/WebInspectorProxy.cpp

@@ -108,17 +108,13 @@ void WebInspectorProxy::invalidate()
         WebInspectorServer::singleton().unregisterPage(m_remoteInspectionPageId);
 #endif
 
-    // We can be called reentrantly through platformInvalidate(), in which case nothing needs to be done.
-    if (!m_inspectedPage)
-        return;
-
     m_inspectedPage->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID());
 
-    pageLevelMap().remove(m_inspectedPage);
-    m_inspectedPage = nullptr;
-
     didClose();
     platformInvalidate();
+
+    pageLevelMap().remove(m_inspectedPage);
+    m_inspectedPage = nullptr;
 }
 
 // Public APIs
@@ -184,8 +180,7 @@ void WebInspectorProxy::close()
 
 void WebInspectorProxy::didRelaunchInspectorPageProcess()
 {
-    if (inspectionLevel() == 1)
-        m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
+    m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
     m_inspectorPage->process().assumeReadAccessToBaseURL(WebInspectorProxy::inspectorBaseURL());
 
     // When didRelaunchInspectorPageProcess is called we can assume it is during a load request.
@@ -515,8 +510,7 @@ void WebInspectorProxy::eagerlyCreateInspectorPage()
     WKPageSetPageLoaderClient(toAPI(m_inspectorPage), &loaderClient.base);
     WKPageSetPageContextMenuClient(toAPI(m_inspectorPage), &contextMenuClient.base);
 
-    if (inspectionLevel() == 1)
-        m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
+    m_inspectorPage->process().addMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID(), *this);
     m_inspectorPage->process().assumeReadAccessToBaseURL(WebInspectorProxy::inspectorBaseURL());
 }
 
@@ -578,9 +572,7 @@ void WebInspectorProxy::didClose()
     if (!m_inspectorPage)
         return;
 
-    if (inspectionLevel() == 1)
-        m_inspectorPage->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectorPage->pageID());
-
+    m_inspectorPage->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID());
     m_inspectorPage = nullptr;
 
     m_isVisible = false;