REGRESSION (r216129): ASSERTION FAILED: m_process->state() == WebProcessProxy::State...
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 3 May 2017 21:56:33 +0000 (21:56 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 3 May 2017 21:56:33 +0000 (21:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=171616

Reviewed by Brady Eidson.

Stop calling resetStateAfterProcessExited() in WebPageProxy::terminateProcess() as the call to
WebProcessProxy::requestTermination() already causes WebPageProxy::processDidCrash() to be called
after r216129. WebPageProxy::processDidCrash() already takes care of calling
resetStateAfterProcessExited().

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::terminateProcess):

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

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebPageProxy.cpp

index dc61a84..3df068c 100644 (file)
@@ -1,3 +1,18 @@
+2017-05-03  Chris Dumez  <cdumez@apple.com>
+
+        REGRESSION (r216129): ASSERTION FAILED: m_process->state() == WebProcessProxy::State::Terminated
+        https://bugs.webkit.org/show_bug.cgi?id=171616
+
+        Reviewed by Brady Eidson.
+
+        Stop calling resetStateAfterProcessExited() in WebPageProxy::terminateProcess() as the call to
+        WebProcessProxy::requestTermination() already causes WebPageProxy::processDidCrash() to be called
+        after r216129. WebPageProxy::processDidCrash() already takes care of calling
+        resetStateAfterProcessExited().
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::terminateProcess):
+
 2017-05-03  Brady Eidson  <beidson@apple.com>
 
         Handle KVO updating of the "hasOnlySecureContent" before a page results in an HTTP auth challenge.
 2017-05-03  Brady Eidson  <beidson@apple.com>
 
         Handle KVO updating of the "hasOnlySecureContent" before a page results in an HTTP auth challenge.
index b65b619..89006ab 100644 (file)
@@ -2412,7 +2412,6 @@ void WebPageProxy::terminateProcess()
         return;
 
     m_process->requestTermination();
         return;
 
     m_process->requestTermination();
-    resetStateAfterProcessExited();
 }
 
 SessionState WebPageProxy::sessionState(const std::function<bool (WebBackForwardListItem&)>& filter) const
 }
 
 SessionState WebPageProxy::sessionState(const std::function<bool (WebBackForwardListItem&)>& filter) const