Diff
Modified: branches/safari-601.1.46.60-branch/LayoutTests/ChangeLog (193838 => 193839)
--- branches/safari-601.1.46.60-branch/LayoutTests/ChangeLog 2015-12-09 17:48:36 UTC (rev 193838)
+++ branches/safari-601.1.46.60-branch/LayoutTests/ChangeLog 2015-12-09 18:11:22 UTC (rev 193839)
@@ -1,3 +1,7 @@
+2015-12-09 Babak Shafiei <bshaf...@apple.com>
+
+ Roll out r192369.
+
2015-12-07 Babak Shafiei <bshaf...@apple.com>
Merge r191731.
Deleted: branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-different-expected.txt (193838 => 193839)
--- branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-different-expected.txt 2015-12-09 17:48:36 UTC (rev 193838)
+++ branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-different-expected.txt 2015-12-09 18:11:22 UTC (rev 193839)
@@ -1 +0,0 @@
-TEST PASSED
Deleted: branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-different.html (193838 => 193839)
--- branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-different.html 2015-12-09 17:48:36 UTC (rev 193838)
+++ branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-different.html 2015-12-09 18:11:22 UTC (rev 193839)
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- // One iframe's popstate handler removes another iframe from the
- // document during a history navigation that affects both frames. The
- // history navigation loads a different document in the other frame.
- window._onload_ = function () {
- frames[0].history.pushState("first", "first");
- frames[0]._onpopstate_ = function () {
- document.body.innerHTML = "TEST PASSED";
- if (window.testRunner)
- testRunner.notifyDone();
- };
- document.querySelectorAll("iframe")[1]._onload_ = function () {
- setTimeout("history.go(-2);", 10);
- };
- setTimeout(function () {
- frames[1].location.href = ""
- }, 10);
- }
-</script>
-
-<body>
- NOT TESTED
- <iframe src=""
- <iframe src=""
-</body>
Deleted: branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-same-expected.txt (193838 => 193839)
--- branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-same-expected.txt 2015-12-09 17:48:36 UTC (rev 193838)
+++ branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-same-expected.txt 2015-12-09 18:11:22 UTC (rev 193839)
@@ -1 +0,0 @@
-TEST PASSED
Deleted: branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-same.html (193838 => 193839)
--- branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-same.html 2015-12-09 17:48:36 UTC (rev 193838)
+++ branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/remove-iframe-during-history-navigation-same.html 2015-12-09 18:11:22 UTC (rev 193839)
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- // One iframe's popstate handler removes another iframe from the
- // document during a history navigation that affects both frames. The
- // history navigation selects the same document in both frames.
- window._onload_ = function () {
- frames[0].history.pushState("first", "first");
- frames[0]._onpopstate_ = function () {
- document.body.innerHTML = "TEST PASSED";
- if (window.testRunner)
- testRunner.notifyDone();
- };
- frames[1].history.pushState("second", "second");
-
- history.go(-2);
- }
-</script>
-
-<body>
- NOT TESTED
- <iframe src=""
- <iframe src=""
-</body>
Modified: branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/stateobjects/popstate-fires-on-history-traversal.html (193838 => 193839)
--- branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/stateobjects/popstate-fires-on-history-traversal.html 2015-12-09 17:48:36 UTC (rev 193838)
+++ branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/stateobjects/popstate-fires-on-history-traversal.html 2015-12-09 18:11:22 UTC (rev 193839)
@@ -50,13 +50,14 @@
}
currentStep++;
+
+ setTimeout(step, 0);
}
_onpopstate_ = function(event)
{
debug('popstate fired with state ' + event.state);
popstateFireCount++;
- setTimeout(step, 0);
}
var jsTestIsAsync = true;
</script>
Deleted: branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/stateobjects/popstate-is-asynchronous-expected.txt (193838 => 193839)
--- branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/stateobjects/popstate-is-asynchronous-expected.txt 2015-12-09 17:48:36 UTC (rev 193838)
+++ branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/stateobjects/popstate-is-asynchronous-expected.txt 2015-12-09 18:11:22 UTC (rev 193839)
@@ -1,13 +0,0 @@
-Tests that popstate events fire asynchronously.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-onload fired
-popstate fired
-Setting hash to #foo
-Set hash to #foo
-popstate fired
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/stateobjects/popstate-is-asynchronous.html (193838 => 193839)
--- branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/stateobjects/popstate-is-asynchronous.html 2015-12-09 17:48:36 UTC (rev 193838)
+++ branches/safari-601.1.46.60-branch/LayoutTests/fast/loader/stateobjects/popstate-is-asynchronous.html 2015-12-09 18:11:22 UTC (rev 193839)
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<link rel="stylesheet" href="" type="text/css">
-<script src=""
-<div id="description"></div>
-<pre id="console"></pre>
-<script>
-description('Tests that popstate events fire asynchronously.');
-
-window._onload_ = function()
-{
- debug('onload fired');
- history.pushState("test", "test");
- history.back();
-}
-
-var initialPopState = true;
-
-window._onpopstate_ = function()
-{
- debug('popstate fired');
-
- if (initialPopState) {
- initialPopState = false;
-
- // This should not be re-entrant; there should be no other log lines
- // between the "Setting..." and "Set..." lines.
- debug('Setting hash to #foo');
- location.hash = '#foo';
- debug('Set hash to #foo');
- } else
- finishJSTest();
-}
-
-var successfullyParsed = true;
-var jsTestIsAsync = true;
-</script>
-<script src=""
-</html>
Modified: branches/safari-601.1.46.60-branch/Source/WebCore/ChangeLog (193838 => 193839)
--- branches/safari-601.1.46.60-branch/Source/WebCore/ChangeLog 2015-12-09 17:48:36 UTC (rev 193838)
+++ branches/safari-601.1.46.60-branch/Source/WebCore/ChangeLog 2015-12-09 18:11:22 UTC (rev 193839)
@@ -1,3 +1,7 @@
+2015-12-09 Babak Shafiei <bshaf...@apple.com>
+
+ Roll out r192369.
+
2015-12-08 Babak Shafiei <bshaf...@apple.com>
Merge r191748.
Modified: branches/safari-601.1.46.60-branch/Source/WebCore/dom/Document.cpp (193838 => 193839)
--- branches/safari-601.1.46.60-branch/Source/WebCore/dom/Document.cpp 2015-12-09 17:48:36 UTC (rev 193838)
+++ branches/safari-601.1.46.60-branch/Source/WebCore/dom/Document.cpp 2015-12-09 18:11:22 UTC (rev 193839)
@@ -5326,7 +5326,8 @@
void Document::enqueuePopstateEvent(PassRefPtr<SerializedScriptValue> stateObject)
{
- enqueueWindowEvent(PopStateEvent::create(stateObject, m_domWindow ? m_domWindow->history() : nullptr));
+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=36202 Popstate event needs to fire asynchronously
+ dispatchWindowEvent(PopStateEvent::create(stateObject, m_domWindow ? m_domWindow->history() : nullptr));
}
void Document::addMediaCanStartListener(MediaCanStartListener* listener)
