Title: [136264] branches/chromium/1312
- Revision
- 136264
- Author
- [email protected]
- Date
- 2012-11-30 13:21:45 -0800 (Fri, 30 Nov 2012)
Log Message
Merge 135303
BUG=154488
Review URL: https://codereview.chromium.org/11421183
Modified Paths
Added Paths
Diff
Copied: branches/chromium/1312/LayoutTests/fast/frames/frame-unload-crash2-expected.txt (from rev 135303, trunk/LayoutTests/fast/frames/frame-unload-crash2-expected.txt) (0 => 136264)
--- branches/chromium/1312/LayoutTests/fast/frames/frame-unload-crash2-expected.txt (rev 0)
+++ branches/chromium/1312/LayoutTests/fast/frames/frame-unload-crash2-expected.txt 2012-11-30 21:21:45 UTC (rev 136264)
@@ -0,0 +1 @@
+PASS. WebKit didn't crash.
Copied: branches/chromium/1312/LayoutTests/fast/frames/frame-unload-crash2.html (from rev 135303, trunk/LayoutTests/fast/frames/frame-unload-crash2.html) (0 => 136264)
--- branches/chromium/1312/LayoutTests/fast/frames/frame-unload-crash2.html (rev 0)
+++ branches/chromium/1312/LayoutTests/fast/frames/frame-unload-crash2.html 2012-11-30 21:21:45 UTC (rev 136264)
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<iframe srcdoc=""></iframe>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+function finish() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+frames[0]._onunload_ = function () {
+ document.open();
+ document.write("PASS. WebKit didn't crash.");
+ document.close();
+
+ setTimeout("finish()", 0);
+};
+</script>
+</html>
Modified: branches/chromium/1312/Source/WebCore/loader/FrameLoader.cpp (136263 => 136264)
--- branches/chromium/1312/Source/WebCore/loader/FrameLoader.cpp 2012-11-30 21:20:17 UTC (rev 136263)
+++ branches/chromium/1312/Source/WebCore/loader/FrameLoader.cpp 2012-11-30 21:21:45 UTC (rev 136264)
@@ -1663,6 +1663,7 @@
{
RefPtr<CachedPage> cachedPage = m_loadingFromCachedPage ? pageCache()->get(history()->provisionalItem()) : 0;
RefPtr<DocumentLoader> pdl = m_provisionalDocumentLoader;
+ RefPtr<Frame> protect(m_frame);
LOG(PageCache, "WebCoreLoading %s: About to commit provisional load from previous URL '%s' to new URL '%s'", m_frame->tree()->uniqueName().string().utf8().data(),
m_frame->document() ? m_frame->document()->url().string().utf8().data() : "",
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
