[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
eric at webkit.org
eric at webkit.org
Thu Feb 4 21:30:18 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 139888f9ae99cdd30b19517f15cd18b0f3f5ecb4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 28 01:41:31 2010 +0000
2010-01-27 John Abd-El-Malek <jam at chromium.org>
Reviewed by Dimitri Glazkov.
Tests that when a page removes an iframe that sleeps in its unload handler and
terminates its JS execution, the outer page's JS continues running.
https://bugs.webkit.org/show_bug.cgi?id=34226
* fast/dom/Window/slow-unload-handler-expected.txt: Copied from LayoutTests/fast/dom/Window/slow_unload_handler-expected.txt.
* fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html: Added.
* fast/dom/Window/slow-unload-handler-only-frame-is-stopped-expected.txt: Added.
* fast/dom/Window/slow-unload-handler.html: Copied from LayoutTests/fast/dom/Window/slow_unload_handler.html.
* fast/dom/Window/slow_unload_handler-expected.txt: Removed.
* fast/dom/Window/slow_unload_handler.html: Removed.
* platform/gtk/Skipped:
* platform/mac/Skipped:
* platform/qt/Skipped:
* platform/win/Skipped:
2010-01-27 John Abd-El-Malek <jam at chromium.org>
Reviewed by Dimitri Glazkov.
Tests that when a page removes an iframe that sleeps in its unload handler and
terminates its JS execution, the outer page's JS continues running.
https://bugs.webkit.org/show_bug.cgi?id=34226
Tests: fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
fast/dom/Window/slow-unload-handler.html
* bindings/v8/DateExtension.cpp:
(WebCore::DateExtension::OnSleepDetected):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53965 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 63b47ae..9417b99 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2010-01-27 John Abd-El-Malek <jam at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ Tests that when a page removes an iframe that sleeps in its unload handler and
+ terminates its JS execution, the outer page's JS continues running.
+
+ https://bugs.webkit.org/show_bug.cgi?id=34226
+
+ * fast/dom/Window/slow-unload-handler-expected.txt: Copied from LayoutTests/fast/dom/Window/slow_unload_handler-expected.txt.
+ * fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html: Added.
+ * fast/dom/Window/slow-unload-handler-only-frame-is-stopped-expected.txt: Added.
+ * fast/dom/Window/slow-unload-handler.html: Copied from LayoutTests/fast/dom/Window/slow_unload_handler.html.
+ * fast/dom/Window/slow_unload_handler-expected.txt: Removed.
+ * fast/dom/Window/slow_unload_handler.html: Removed.
+ * platform/gtk/Skipped:
+ * platform/mac/Skipped:
+ * platform/qt/Skipped:
+ * platform/win/Skipped:
+
2010-01-27 Kent Tamura <tkent at chromium.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/dom/Window/slow_unload_handler-expected.txt b/LayoutTests/fast/dom/Window/slow-unload-handler-expected.txt
similarity index 100%
rename from LayoutTests/fast/dom/Window/slow_unload_handler-expected.txt
rename to LayoutTests/fast/dom/Window/slow-unload-handler-expected.txt
diff --git a/LayoutTests/fast/dom/Window/slow-unload-handler-only-frame-is-stopped-expected.txt b/LayoutTests/fast/dom/Window/slow-unload-handler-only-frame-is-stopped-expected.txt
new file mode 100644
index 0000000..bf2075f
--- /dev/null
+++ b/LayoutTests/fast/dom/Window/slow-unload-handler-only-frame-is-stopped-expected.txt
@@ -0,0 +1,6 @@
+frame "foo" - has 1 onunload handler(s)
+This is a test for bug 34226: [v8]: Regression: onunload event handling. If successful, PASS should be printed below.
+
+PASS
+
+
diff --git a/LayoutTests/fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html b/LayoutTests/fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
new file mode 100644
index 0000000..f31d90e
--- /dev/null
+++ b/LayoutTests/fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
@@ -0,0 +1,33 @@
+<html>
+<head>
+<link rel="stylesheet" href="../../js/resources/js-test-style.css">
+<script>
+if (layoutTestController) {
+ layoutTestController.waitUntilDone();
+ layoutTestController.dumpAsText();
+}
+
+function done()
+{
+ if (document.getElementById("results").innerHTML == "")
+ document.getElementById("results").appendChild(document.createTextNode("PASS"));
+ if (layoutTestController)
+ layoutTestController.notifyDone();
+}
+
+function removeFrame()
+{
+ var foo = document.getElementById('foo');
+ foo.parentNode.removeChild(foo);
+ done();
+}
+</script>
+<body>
+<p>
+ This is a test for <a href="https://bugs.webkit.org/show_bug.cgi?id=34226">bug 34226</a>:
+ <i>[v8]: Regression: onunload event handling</i>. If successful, PASS should be printed below.
+</p>
+<p id="results" class="pass"></p>
+<iframe id='foo' src="data:text/html,<body onunload='handleUnload()'><script>function handleUnload() {var now=new Date();var exitTime=now.getTime()+5000;while(true){now=new Date();if(now.getTime()>exitTime)break}}</script></body>" onload="removeFrame()"></iframe>
+</body>
+</html>
\ No newline at end of file
diff --git a/LayoutTests/fast/dom/Window/slow_unload_handler.html b/LayoutTests/fast/dom/Window/slow-unload-handler.html
similarity index 100%
rename from LayoutTests/fast/dom/Window/slow_unload_handler.html
rename to LayoutTests/fast/dom/Window/slow-unload-handler.html
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 1ef4fd9..0333b90 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5597,7 +5597,8 @@ http/tests/xmlhttprequest/workers/shared-worker-methods-async.html
http/tests/loading/basic-credentials-sent-automatically.html
# This port doesn't support detecting slow unload handlers.
-fast/dom/Window/slow_unload_handler.html
+fast/dom/Window/slow-unload-handler.html
+fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
# Tests generating new results
fast/table/fixed-table-with-percent-inside-percent-table.html
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index bd20b1f..8f6d03c 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -73,7 +73,8 @@ media/video-controls-zoomed.html
media/video-volume-slider.html
# This port doesn't support detecting slow unload handlers.
-fast/dom/Window/slow_unload_handler.html
+fast/dom/Window/slow-unload-handler.html
+fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
# Skipped until we have a fix for <rdar://problem/6563117> WebKit should tell QuickTime to exclude the text importer
media/video-empty-source.html
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 58137f5..4327833 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -4837,7 +4837,8 @@ http/tests/loading/basic-credentials-sent-automatically.html
http/tests/loading/basic-auth-resend-wrong-credentials.html
# This port doesn't support detecting slow unload handlers.
-fast/dom/Window/slow_unload_handler.html
+fast/dom/Window/slow-unload-handler.html
+fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
# This port doesn't have a global history delegate yet
http/tests/globalhistory
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 6c01350..29dbd84 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -660,7 +660,8 @@ plugins/destroy-during-npp-new.html
http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception.html
# This port doesn't support detecting slow unload handlers.
-fast/dom/Window/slow_unload_handler.html
+fast/dom/Window/slow-unload-handler.html
+fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
# <https://bugs.webkit.org/show_bug.cgi?id=30348>
plugins/private-browsing-mode.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a000a09..d6e22f7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-27 John Abd-El-Malek <jam at chromium.org>
+
+ Reviewed by Dimitri Glazkov.
+
+ Tests that when a page removes an iframe that sleeps in its unload handler and
+ terminates its JS execution, the outer page's JS continues running.
+
+ https://bugs.webkit.org/show_bug.cgi?id=34226
+
+ Tests: fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
+ fast/dom/Window/slow-unload-handler.html
+
+ * bindings/v8/DateExtension.cpp:
+ (WebCore::DateExtension::OnSleepDetected):
+
2010-01-27 Kent Tamura <tkent at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/bindings/v8/DateExtension.cpp b/WebCore/bindings/v8/DateExtension.cpp
index 7d8b9be..abf8967 100644
--- a/WebCore/bindings/v8/DateExtension.cpp
+++ b/WebCore/bindings/v8/DateExtension.cpp
@@ -116,7 +116,7 @@ v8::Handle<v8::Value> DateExtension::Setup(const v8::Arguments& args)
v8::Handle<v8::Value> DateExtension::OnSleepDetected(const v8::Arguments&)
{
- v8::V8::TerminateExecution();
+ V8Proxy::throwError(V8Proxy::GeneralError, "Too much time spent in unload handler.");
return v8::Undefined();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list