Title: [89723] tags/Safari-534.48.2/Source/WebCore
- Revision
- 89723
- Author
- lforsch...@apple.com
- Date
- 2011-06-24 18:55:54 -0700 (Fri, 24 Jun 2011)
Log Message
Merge r89714.
Modified Paths
Diff
Modified: tags/Safari-534.48.2/Source/WebCore/ChangeLog (89722 => 89723)
--- tags/Safari-534.48.2/Source/WebCore/ChangeLog 2011-06-25 01:38:57 UTC (rev 89722)
+++ tags/Safari-534.48.2/Source/WebCore/ChangeLog 2011-06-25 01:55:54 UTC (rev 89723)
@@ -1,5 +1,21 @@
2011-06-14 Lucas Forschler <lforsch...@apple.com>
+ Merged 89714.
+
+ 2011-06-24 Alexey Proskuryakov <a...@apple.com>
+
+ Rubber-stamped by Maciej Stachowiak.
+
+ REGRESSION (r88984): Infinite recursion in DocumentLoader::detachFromFrame/stopLoading
+
+ No new tests, as there is no known way to reproduce this (but we'll keep investigating, as
+ the rollout will re-introduce the older less frequent crash).
+
+ * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::detachFromFrame): Rollout the fix
+ for bug 62764.
+
+2011-06-14 Lucas Forschler <lforsch...@apple.com>
+
Rolled out 89080.
2011-06-14 Lucas Forschler <lforsch...@apple.com>
Modified: tags/Safari-534.48.2/Source/WebCore/loader/DocumentLoader.cpp (89722 => 89723)
--- tags/Safari-534.48.2/Source/WebCore/loader/DocumentLoader.cpp 2011-06-25 01:38:57 UTC (rev 89722)
+++ tags/Safari-534.48.2/Source/WebCore/loader/DocumentLoader.cpp 2011-06-25 01:55:54 UTC (rev 89723)
@@ -400,10 +400,6 @@
{
ASSERT(m_frame);
- // It never makes sense to have a document loader that is detached from its
- // frame have any loads active, so go ahead and kill all the loads.
- stopLoading();
-
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
m_applicationCacheHost->setDOMApplicationCache(0);
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
