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

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit d881a570ce12f5ec97bfa0ef2faff0790b7bbd43
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 21:31:06 2009 +0000

    2009-10-15  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: Prevent subsequent tests from failing upon inspector
            test timeout.
    
            https://bugs.webkit.org/show_bug.cgi?id=30404
    
            * inspector/evaluate-in-frontend.js:
            (onload.setTimeout):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49656 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4f86b5b..600ae66 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-15  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Prevent subsequent tests from failing upon inspector
+        test timeout.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30404
+
+        * inspector/evaluate-in-frontend.js:
+        (onload.setTimeout):
+
 2009-10-15  Zan Dobersek  <zandobersek at gmail.com>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/inspector/evaluate-in-frontend.js b/LayoutTests/inspector/evaluate-in-frontend.js
index 3522417..ae17d82 100755
--- a/LayoutTests/inspector/evaluate-in-frontend.js
+++ b/LayoutTests/inspector/evaluate-in-frontend.js
@@ -22,12 +22,19 @@ function onload()
         return;
     var callId = lastCallId++;
     setTimeout(function() {
-        if (window.layoutTestController) {
-            // layoutTestController.showWebInspector();
+        if (window.layoutTestController)
             layoutTestController.evaluateInWebInspector(callId, document.getElementById("frontend-script").textContent);
-        }
         doit();
     }, 0);
+
+    // Make sure web inspector window is closed before the test is interrupted.
+    setTimeout(function() {
+        alert("Internal timeout exceeded.")
+        if (window.layoutTestController) {
+            layoutTestController.closeWebInspector();
+            layoutTestController.notifyDone();
+        }
+    }, 10000);
 }
 
 function evaluateInWebInspector(script, callback)

-- 
WebKit Debian packaging