Title: [171410] branches/safari-600.1-branch/Source/WebKit2
- Revision
- 171410
- Author
- dburk...@apple.com
- Date
- 2014-07-22 22:41:28 -0700 (Tue, 22 Jul 2014)
Log Message
Merge r171211
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171409 => 171410)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 05:39:05 UTC (rev 171409)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 05:41:28 UTC (rev 171410)
@@ -1,5 +1,24 @@
2014-07-22 Dana Burkart <dburk...@apple.com>
+ Merge r171211.
+
+ 2014-07-17 Alexey Proskuryakov <a...@apple.com>
+
+ REGRESSION (r171167): LoaderClient processDidCrash call is made after load state changes
+ https://bugs.webkit.org/show_bug.cgi?id=135032
+ <rdar://problem/17716602>
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::processDidCrash): Create a transaction, so that the nested
+ transaction in resetStateAfterProcessExited() wouldn't be committed.
+ (WebKit::WebPageProxy::resetStateAfterProcessExited): Don't use auto - it was hiding
+ the most important fact that this is a stack object that can't be simply moved to
+ a different function.
+
+2014-07-22 Dana Burkart <dburk...@apple.com>
+
Merge r171167.
2014-07-16 Alexey Proskuryakov <a...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (171409 => 171410)
--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-23 05:39:05 UTC (rev 171409)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-23 05:41:28 UTC (rev 171410)
@@ -4274,6 +4274,9 @@
{
ASSERT(m_isValid);
+ // There is a nested transaction in resetStateAfterProcessExited() that we don't want to commit before the client call.
+ PageLoadState::Transaction transaction = m_pageLoadState.transaction();
+
resetStateAfterProcessExited();
m_loaderClient->processDidCrash(this);
@@ -4431,7 +4434,7 @@
m_pageClient.dismissDictionaryLookupPanel();
#endif
- auto transaction = m_pageLoadState.transaction();
+ PageLoadState::Transaction transaction = m_pageLoadState.transaction();
m_pageLoadState.reset(transaction);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
