Title: [164889] trunk/Source/WebKit2
- Revision
- 164889
- Author
- [email protected]
- Date
- 2014-02-28 15:11:22 -0800 (Fri, 28 Feb 2014)
Log Message
WebKit2.TerminateTwice test is failing.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::resetStateAfterProcessExited):
Turns out this can be called even when we're in the launching state so don't try to
remove the process from the visited link provider when in that state.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (164888 => 164889)
--- trunk/Source/WebKit2/ChangeLog 2014-02-28 23:05:58 UTC (rev 164888)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-28 23:11:22 UTC (rev 164889)
@@ -1,3 +1,12 @@
+2014-02-28 Anders Carlsson <[email protected]>
+
+ WebKit2.TerminateTwice test is failing.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+ Turns out this can be called even when we're in the launching state so don't try to
+ remove the process from the visited link provider when in that state.
+
2014-02-28 Chris Fleizach <[email protected]>
AX: Crash in WebKit::WebPageProxy::registerWebProcessAccessibilityToken
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (164888 => 164889)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-28 23:05:58 UTC (rev 164888)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-02-28 23:11:22 UTC (rev 164889)
@@ -3912,8 +3912,12 @@
if (!isValid())
return;
- m_visitedLinkProvider->removeProcess(m_process.get());
+ // FIXME: It's weird that resetStateAfterProcessExited() is called even though the process is launching.
+ ASSERT(m_process->state() == WebProcessProxy::State::Launching || m_process->state() == WebProcessProxy::State::Terminated);
+ if (m_process->state() == WebProcessProxy::State::Terminated)
+ m_visitedLinkProvider->removeProcess(m_process.get());
+
m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
m_isValid = false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
