Title: [216144] trunk/Source/WebKit2
- Revision
- 216144
- Author
- cdu...@apple.com
- Date
- 2017-05-03 14:56:33 -0700 (Wed, 03 May 2017)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (216143 => 216144)
--- trunk/Source/WebKit2/ChangeLog 2017-05-03 21:55:25 UTC (rev 216143)
+++ trunk/Source/WebKit2/ChangeLog 2017-05-03 21:56:33 UTC (rev 216144)
@@ -1,3 +1,18 @@
+2017-05-03 Chris Dumez <cdu...@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 <beid...@apple.com>
Handle KVO updating of the "hasOnlySecureContent" before a page results in an HTTP auth challenge.
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (216143 => 216144)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-05-03 21:55:25 UTC (rev 216143)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-05-03 21:56:33 UTC (rev 216144)
@@ -2412,7 +2412,6 @@
return;
m_process->requestTermination();
- resetStateAfterProcessExited();
}
SessionState WebPageProxy::sessionState(const std::function<bool (WebBackForwardListItem&)>& filter) const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
