[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ojan at chromium.org
ojan at chromium.org
Wed Dec 22 13:10:09 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 6343745840a098391bfd71210a676aac04e0b483
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 8 01:26:37 2010 +0000
2010-09-07 Ojan Vafai <ojan at chromium.org>
Reviewed by Kent Tamura.
Markup.waitUntilDone does not call Markup.noAutoDump without LayoutTestController
https://bugs.webkit.org/show_bug.cgi?id=45123
* resources/dump-as-markup.js:
(Markup.waitUntilDone):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66944 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bf4bc88..daedb7c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-07 Ojan Vafai <ojan at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ Markup.waitUntilDone does not call Markup.noAutoDump without LayoutTestController
+ https://bugs.webkit.org/show_bug.cgi?id=45123
+
+ * resources/dump-as-markup.js:
+ (Markup.waitUntilDone):
+
2010-09-07 Mihai Parparita <mihaip at chromium.org>
Reviewed by Oliver Hunt.
diff --git a/LayoutTests/resources/dump-as-markup.js b/LayoutTests/resources/dump-as-markup.js
index eafcc80..4d5306e 100644
--- a/LayoutTests/resources/dump-as-markup.js
+++ b/LayoutTests/resources/dump-as-markup.js
@@ -89,7 +89,8 @@ Markup.noAutoDump = function()
Markup.waitUntilDone = function()
{
- layoutTestController.waitUntilDone();
+ if (window.layoutTestController)
+ layoutTestController.waitUntilDone();
Markup.noAutoDump();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list