[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2e16d41e9a1edfc2c9abb499068a8162e6bdd931
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 2 20:45:25 2010 +0000

    2010-09-02  Matthew Willis  <lilmatt at flock.com>
    
            Reviewed by Eric Seidel.
    
            Attempt to fix flaxy test that contains setTimeout() by adding
            layoutTestController.waitUntilDone() and ...notifyDone()
            https://bugs.webkit.org/show_bug.cgi?id=45097
    
            * fast/css/disabled-author-styles.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66684 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b0f0a19..6f68113 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-02  Matthew Willis  <lilmatt at flock.com>
+
+        Reviewed by Eric Seidel.
+
+        Attempt to fix flaxy test that contains setTimeout() by adding
+        layoutTestController.waitUntilDone() and ...notifyDone()
+        https://bugs.webkit.org/show_bug.cgi?id=45097
+
+        * fast/css/disabled-author-styles.html:
+
 2010-09-02  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/LayoutTests/fast/css/disabled-author-styles.html b/LayoutTests/fast/css/disabled-author-styles.html
index 5432a52..8888547 100644
--- a/LayoutTests/fast/css/disabled-author-styles.html
+++ b/LayoutTests/fast/css/disabled-author-styles.html
@@ -7,7 +7,7 @@
                alert("This test must be run in the DumpRenderTree to work.");
                return;
             }
-
+            layoutTestController.waitUntilDone();
             layoutTestController.setAuthorAndUserStylesEnabled(false);
 
             // Check the matched rules after a timeout to give time for WebPreferences to update WebCore::Settings.
@@ -19,6 +19,10 @@
             var matchedRules = getMatchedCSSRules(document.getElementById("test"), "", true);
             if (matchedRules && matchedRules.length)
                 alert(matchedRules.length + " rule(s) were returned from getMatchedCSSRules, expected zero.");
+
+            if (window.layoutTestController) {
+                layoutTestController.notifyDone();
+            }
         }
     </script>
     <style>

-- 
WebKit Debian packaging