[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 765ab311020045927cf759510ff9971d1160fb15
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 20:21:12 2009 +0000

    2009-10-16  Yuzo Fujishima  <yuzo at google.com>
    
            Reviewed by Darin Adler.
    
            LayoutTests/fast/loader/local-JavaScript-from-local.html times out in case of error.
            https://bugs.webkit.org/show_bug.cgi?id=30434
    
            * fast/loader/local-JavaScript-from-local.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bc576c9..28a096a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-16  Yuzo Fujishima  <yuzo at google.com>
+
+        Reviewed by Darin Adler.
+
+        LayoutTests/fast/loader/local-JavaScript-from-local.html times out in case of error.
+        https://bugs.webkit.org/show_bug.cgi?id=30434
+
+        * fast/loader/local-JavaScript-from-local.html:
+
 2009-10-16  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Ariya Hidayat.
diff --git a/LayoutTests/fast/loader/local-JavaScript-from-local.html b/LayoutTests/fast/loader/local-JavaScript-from-local.html
index 3bf32cc..4e70dd5 100644
--- a/LayoutTests/fast/loader/local-JavaScript-from-local.html
+++ b/LayoutTests/fast/loader/local-JavaScript-from-local.html
@@ -28,6 +28,9 @@
         localScriptElement.addEventListener("error", function() {
             var tag = document.getElementById("result");
             tag.innerHTML = "Test Failed: Local script not loaded.";
+
+            if (window.layoutTestController)
+                layoutTestController.notifyDone();
         });
 
         document.body.appendChild(localScriptElement)

-- 
WebKit Debian packaging