[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[jparent at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit a1c14ff8aaccba889324b8303ecd84b2e0634143
Author: jparent at chromium.org <jparent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 17 21:40:03 2009 +0000

    Eliminate flakiness in char-encoding tests by removing setTimeout,
    that was working around an old issue.
    https://bugs.webkit.org/show_bug.cgi?id=31571
    
    Reviewed by Darin Adler.
    
    * fast/encoding/char-encoding-mac.html:
    * fast/encoding/char-encoding.html:
    * fast/encoding/resources/char-encoding-utils.js:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51088 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4bb987c..6a0cc9f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-16  Julie Parent  <jparent at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Eliminate flakiness in char-encoding tests by removing setTimeout,
+        that was working around an old issue.
+        https://bugs.webkit.org/show_bug.cgi?id=31571
+
+        * fast/encoding/char-encoding-mac.html:
+        * fast/encoding/char-encoding.html:
+        * fast/encoding/resources/char-encoding-utils.js:
+
 2009-11-17  Csaba Osztrogonác  <ossy at webkit.org>
 
         Not reviewed, follow up to r51072: rename skipped entries
diff --git a/LayoutTests/fast/encoding/char-encoding-mac.html b/LayoutTests/fast/encoding/char-encoding-mac.html
index 0fc9dc9..fd6ef24 100644
--- a/LayoutTests/fast/encoding/char-encoding-mac.html
+++ b/LayoutTests/fast/encoding/char-encoding-mac.html
@@ -21,8 +21,6 @@ var results = new Object;
 
 var i = 0;
 
-var timeout = null;
-
 // Legacy Mac encodings.
 testEncode('mac', 'U+221A', '%C3');
 testEncode('macintosh', 'U+221A', '%C3');
diff --git a/LayoutTests/fast/encoding/char-encoding.html b/LayoutTests/fast/encoding/char-encoding.html
index 3398a56..be1e05b 100644
--- a/LayoutTests/fast/encoding/char-encoding.html
+++ b/LayoutTests/fast/encoding/char-encoding.html
@@ -21,8 +21,6 @@ var results = new Object;
 
 var i = 0;
 
-var timeout = null;
-
 testEncode("UTF-8", "U+00A0", "%C2%A0");
 //Yen symbol in gbk
 testEncode('GBK', 'U+00A5', '%A3%A4');
diff --git a/LayoutTests/fast/encoding/resources/char-encoding-utils.js b/LayoutTests/fast/encoding/resources/char-encoding-utils.js
index 3e8ae7c..2007c7f 100644
--- a/LayoutTests/fast/encoding/resources/char-encoding-utils.js
+++ b/LayoutTests/fast/encoding/resources/char-encoding-utils.js
@@ -24,8 +24,6 @@ function testsDone()
         layoutTestController.notifyDone();
 }
 
-var timeout = null;
-
 function processResult(result)
 {
     var charsetResults = results[charsets[i]];
@@ -38,24 +36,12 @@ function processResult(result)
 
 function subframeLoaded()
 {
-    clearTimeout(timeout);
-    timeout = null;
     var URL = "" + document.getElementById('subframe').contentWindow.location;
     processResult(URL.substr(URL.indexOf('=') + 1));
     ++i;
     runTest();
 }
 
-// Workaround for rdar://problem/5114296 need to allow for 
-// download occuring, and thus not triggering subframeLoaded()
-function loadTimedOut()
-{
-    timeout = null;
-    processResult("FAILED");    
-    ++i;
-    runTest();
-}
-
 function runTest()
 {    
     if (i >= charsets.length) {
@@ -72,10 +58,6 @@ function runTest()
     subframe.onload = subframeLoaded;
     text.value = String.fromCharCode(unicodes[i].replace('U+', '0x'));
     
-    // Workaround for rdar://problem/5114296
-    // 500 millisecond timeout. This will cause a significant slowdown on failures, 
-    // but should guarantee we don't fire prematurely
-    timeout = setTimeout(loadTimedOut, 500);
     form.submit();
 }
 

-- 
WebKit Debian packaging