[Cocoa] Fix incorrect rebase
authorpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Mar 2020 16:12:49 +0000 (16:12 +0000)
committerpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 26 Mar 2020 16:12:49 +0000 (16:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=209600

Reviewed by Brent Fulgham.

A rebase went wrong in <https://bugs.webkit.org/show_bug.cgi?id=203214> and placed the method call to
enableRemoteInspectorIfNeeded() in the wrong method. It should be called in WebProcessProxy::didFinishLaunching.

* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::mayBecomeUnresponsive):
(WebKit::WebProcessProxy::didFinishLaunching):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@259046 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/WebProcessProxy.cpp

index 079337b..a3ff4ee 100644 (file)
@@ -1,3 +1,17 @@
+2020-03-26  Per Arne Vollan  <pvollan@apple.com>
+
+        [Cocoa] Fix incorrect rebase
+        https://bugs.webkit.org/show_bug.cgi?id=209600
+
+        Reviewed by Brent Fulgham.
+
+        A rebase went wrong in <https://bugs.webkit.org/show_bug.cgi?id=203214> and placed the method call to
+        enableRemoteInspectorIfNeeded() in the wrong method. It should be called in WebProcessProxy::didFinishLaunching.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::mayBecomeUnresponsive):
+        (WebKit::WebProcessProxy::didFinishLaunching):
+
 2020-03-26  Michael Catanzaro  <mcatanzaro@gnome.org>
 
         [GTK] Crash in WebKit::LayerTreeHost::LayerTreeHost with bubblewrap sandbox enabled
index 48a3aee..6618fd7 100644 (file)
@@ -911,10 +911,6 @@ bool WebProcessProxy::mayBecomeUnresponsive()
 
     return true;
 #endif
-
-#if ENABLE(REMOTE_INSPECTOR) && PLATFORM(COCOA)
-    enableRemoteInspectorIfNeeded();
-#endif
 }
 
 void WebProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connection::Identifier connectionIdentifier)
@@ -945,6 +941,9 @@ void WebProcessProxy::didFinishLaunching(ProcessLauncher* launcher, IPC::Connect
 
 #if PLATFORM(COCOA)
     unblockAccessibilityServerIfNeeded();
+#if ENABLE(REMOTE_INSPECTOR)
+    enableRemoteInspectorIfNeeded();
+#endif
 #endif
 
     if (m_shouldStartResponsivenessTimerWhenLaunched) {