2010-09-07 Ojan Vafai <ojan@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: https://svn.webkit.org/repository/webkit/trunk@66944 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bf4bc88bb8f68846c1a3aa39706371d694f0f997..daedb7c3ac72b4338d1b132c3a25bafbd1516373 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-07  Ojan Vafai  <ojan@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@chromium.org>
 
         Reviewed by Oliver Hunt.

diff --git a/LayoutTests/resources/dump-as-markup.js b/LayoutTests/resources/dump-as-markup.js
index eafcc8092952b847c546c73a481aef96d5e0892e..4d5306ecc4c6e8e22eed18604ff0ac107a51d4cc 100644 (file)
--- 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();
 }