Changeset 205299 in webkit

Timestamp:

Sep 1, 2016 11:08:54 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[Mac] Web Inspector: Remove stale inspector process termination code
​https://bugs.webkit.org/show_bug.cgi?id=161465
<rdar://problem/28106584>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-09-01
Reviewed by Brian Burg.

• UIProcess/WebInspectorProxy.cpp:

(WebKit::WebInspectorProxy::didRelaunchInspectorPageProcess): Deleted.

• UIProcess/WebInspectorProxy.h:
• UIProcess/mac/WebInspectorProxyMac.mm:

(-[WKWebInspectorProxyObjCAdapter didRelaunchProcess]): Deleted.
(-[WKWebInspectorWKWebView _didRelaunchProcess]): Deleted.
This code doesn't appear to be run when the WebContent process inside
of an Inspector process crashes. The general WebInspectorProxy has its
own handling of when the page inside an inspector process crashes, so
this Mac specific path appears to be unused and stale.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebInspectorProxy.cpp (modified) (1 diff)
• UIProcess/WebInspectorProxy.h (modified) (1 diff)
• UIProcess/mac/WebInspectorProxyMac.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-01  Joseph Pecoraro  <pecoraro@apple.com>
+
+        [Mac] Web Inspector: Remove stale inspector process termination code
+        https://bugs.webkit.org/show_bug.cgi?id=161465
+        <rdar://problem/28106584>
+
+        Reviewed by Brian Burg.
+
+        * UIProcess/WebInspectorProxy.cpp:
+        (WebKit::WebInspectorProxy::didRelaunchInspectorPageProcess): Deleted.
+        * UIProcess/WebInspectorProxy.h:
+        * UIProcess/mac/WebInspectorProxyMac.mm:
+        (-[WKWebInspectorProxyObjCAdapter didRelaunchProcess]): Deleted.
+        (-[WKWebInspectorWKWebView _didRelaunchProcess]): Deleted.
+        This code doesn't appear to be run when the WebContent process inside
+        of an Inspector process crashes. The general WebInspectorProxy has its
+        own handling of when the page inside an inspector process crashes, so
+        this Mac specific path appears to be unused and stale.
+
 2016-09-01  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp

@@ -179 +179 @@
 }
 
-void WebInspectorProxy::didRelaunchInspectorPageProcess()
-{
-    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.
-    // Any messages we would have sent to a terminated process need to be re-sent.
-
-    m_inspectorPage->process().send(Messages::WebInspectorUI::EstablishConnection(m_connectionIdentifier, m_inspectedPage->pageID(), m_underTest, inspectionLevel()), m_inspectorPage->pageID());
-}
-
 void WebInspectorProxy::showConsole()
 {

trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h

@@ -93 +93 @@
     void close();
 
-    void didRelaunchInspectorPageProcess();
-
 #if PLATFORM(MAC) && WK_API_ENABLED
     void createInspectorWindow();

trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm

@@ -72 +72 @@
 - (id)initWithWebInspectorProxy:(WebInspectorProxy*)inspectorProxy;
 - (void)close;
-- (void)didRelaunchProcess;
 
 @end
@@ -98 +97 @@
 {
     _inspectorProxy = nullptr;
-}
-
-- (void)didRelaunchProcess
-{
-    static_cast<WebInspectorProxy*>(_inspectorProxy)->didRelaunchInspectorPageProcess();
 }
 
@@ -161 +155 @@
 {
     return WKInspectorViewTag;
-}
-
-- (void)_didRelaunchProcess
-{
-    [self.inspectorProxyObjCAdapter didRelaunchProcess];
 }