Title: [89088] branches/safari-534-branch/Source/WebCore
Diff
Modified: branches/safari-534-branch/Source/WebCore/ChangeLog (89087 => 89088)
--- branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-16 23:49:06 UTC (rev 89087)
+++ branches/safari-534-branch/Source/WebCore/ChangeLog 2011-06-16 23:50:39 UTC (rev 89088)
@@ -1,5 +1,23 @@
2011-06-14 Lucas Forschler <[email protected]>
+ Merged 88984.
+
+ 2011-06-15 Sam Weinig <[email protected]>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Frequent crashes due to null frame below ApplicationCacheHost::scheduleLoadFallbackResourceFromApplicationCache
+ https://bugs.webkit.org/show_bug.cgi?id=62764
+
+ This is an non-reproducible high volume crash, so no test :(.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::detachFromFrame):
+ Be conservative and stop loading when we detach a document loader from a frame.
+
+
+2011-06-14 Lucas Forschler <[email protected]>
+
Merged 88982.
2011-06-15 Beth Dakin <[email protected]>
Modified: branches/safari-534-branch/Source/WebCore/loader/DocumentLoader.cpp (89087 => 89088)
--- branches/safari-534-branch/Source/WebCore/loader/DocumentLoader.cpp 2011-06-16 23:49:06 UTC (rev 89087)
+++ branches/safari-534-branch/Source/WebCore/loader/DocumentLoader.cpp 2011-06-16 23:50:39 UTC (rev 89088)
@@ -399,6 +399,11 @@
void DocumentLoader::detachFromFrame()
{
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
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
