Title: [99579] trunk
- Revision
- 99579
- Author
- [email protected]
- Date
- 2011-11-08 09:42:29 -0800 (Tue, 08 Nov 2011)
Log Message
Document::loader should use documentLoader(), not activeDocumentLoader()
https://bugs.webkit.org/show_bug.cgi?id=65895
Reviewed by Brady Eidson.
Source/WebCore:
Test: fast/loader/stateobjects/replacestate-in-onunload.html
* dom/Document.cpp:
(WebCore::Document::loader):
LayoutTests:
* fast/loader/stateobjects/replacestate-in-onunload-expected.txt: Added.
* fast/loader/stateobjects/replacestate-in-onunload.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (99578 => 99579)
--- trunk/LayoutTests/ChangeLog 2011-11-08 17:36:04 UTC (rev 99578)
+++ trunk/LayoutTests/ChangeLog 2011-11-08 17:42:29 UTC (rev 99579)
@@ -1,3 +1,13 @@
+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-11-08 Philippe Normand <[email protected]>
[GTK] fast/frames/flattening/iframe-flattening-fixed-width-and-height-no-scrolling.html is flaky
Added: trunk/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload-expected.txt (0 => 99579)
--- trunk/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload-expected.txt 2011-11-08 17:42:29 UTC (rev 99579)
@@ -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
+
Added: trunk/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html (0 => 99579)
--- trunk/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html (rev 0)
+++ trunk/LayoutTests/fast/loader/stateobjects/replacestate-in-onunload.html 2011-11-08 17:42:29 UTC (rev 99579)
@@ -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: trunk/Source/WebCore/ChangeLog (99578 => 99579)
--- trunk/Source/WebCore/ChangeLog 2011-11-08 17:36:04 UTC (rev 99578)
+++ trunk/Source/WebCore/ChangeLog 2011-11-08 17:42:29 UTC (rev 99579)
@@ -1,3 +1,15 @@
+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-11-08 Andreas Kling <[email protected]>
CSSImageGeneratorValue: Devirtualize image(), isFixedSize() and fixedSize().
Modified: trunk/Source/WebCore/dom/Document.cpp (99578 => 99579)
--- trunk/Source/WebCore/dom/Document.cpp 2011-11-08 17:36:04 UTC (rev 99578)
+++ trunk/Source/WebCore/dom/Document.cpp 2011-11-08 17:42:29 UTC (rev 99579)
@@ -5066,7 +5066,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
