Title: [104238] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104237 => 104238)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-06 00:12:08 UTC (rev 104237)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-06 00:15:46 UTC (rev 104238)
@@ -1,5 +1,19 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 99579
+
+ 2011-11-08 Justin Schuh <[email protected]>
+
+ Document::loader should use documentLoader(), not activeDocumentLoader()
+ https://bugs.webkit.org/show_bug.cgi?id=65895
+
+ Reviewed by Brady Eidson.
+
+ * fast/loader/stateobjects/replacestate-in-onunload-expected.txt: Added.
+ * fast/loader/stateobjects/replacestate-in-onunload.html: Added.
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 99462
2011-11-07 Ken Buchanan <[email protected]>
Copied: branches/safari-534.54-branch/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload-expected.txt (from rev 99579, trunk/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload-expected.txt) (0 => 104238)
--- branches/safari-534.54-branch/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload-expected.txt 2012-01-06 00:15:46 UTC (rev 104238)
@@ -0,0 +1,4 @@
+This test calls replaceState during the onload handler to verify that the correct document's state is modified. If the test succeeds the URL and text below will show a success message.
+
+PASS
+
Copied: branches/safari-534.54-branch/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html (from rev 99579, trunk/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html) (0 => 104238)
--- branches/safari-534.54-branch/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html 2012-01-06 00:15:46 UTC (rev 104238)
@@ -0,0 +1,36 @@
+<html>
+<head>
+<script>
+
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+}
+
+function log(txt)
+{
+ document.getElementById("logger").innerText += txt + "\n";
+}
+
+
+window._onload_ = function()
+{
+ if (!window.location.search) {
+ window._onunload_ = function() { history.replaceState({}, '', '?FAIL') }
+ window.location = window.location.href + "?PASS";
+ } else {
+ log(window.location.search.slice(1));
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ }
+}
+
+</script>
+<body>
+<p>
+This test calls replaceState during the onload handler to verify that the correct document's state is modified.
+If the test succeeds the URL and text below will show a success message.
+</p>
+<pre id="logger"></pre>
+</body>
+</html>
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104237 => 104238)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-06 00:12:08 UTC (rev 104237)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-06 00:15:46 UTC (rev 104238)
@@ -1,5 +1,21 @@
2011-1-5 Lucas Forschler <[email protected]>
+ Merge 99579
+
+ 2011-11-08 Justin Schuh <[email protected]>
+
+ Document::loader should use documentLoader(), not activeDocumentLoader()
+ https://bugs.webkit.org/show_bug.cgi?id=65895
+
+ Reviewed by Brady Eidson.
+
+ Test: fast/loader/stateobjects/replacestate-in-onunload.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::loader):
+
+2011-1-5 Lucas Forschler <[email protected]>
+
Merge 99462
2011-11-07 Ken Buchanan <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/dom/Document.cpp (104237 => 104238)
--- branches/safari-534.54-branch/Source/WebCore/dom/Document.cpp 2012-01-06 00:12:08 UTC (rev 104237)
+++ branches/safari-534.54-branch/Source/WebCore/dom/Document.cpp 2012-01-06 00:15:46 UTC (rev 104238)
@@ -5184,7 +5184,7 @@
if (!m_frame)
return 0;
- DocumentLoader* loader = m_frame->loader()->activeDocumentLoader();
+ DocumentLoader* loader = m_frame->loader()->documentLoader();
if (!loader)
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
