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

[aestes at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 00073d431dfc9bdc0d6dc78caac76b04a8046803
Author: aestes at apple.com <aestes at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 03:23:45 2010 +0000

    Fix a flakey test.
    
    Rubber-stamped by Jon Honeycutt.
    
    * fast/replaced/object-with-embed-url-param.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66173 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 40462ca..f7ea186 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-26  Andy Estes  <aestes at apple.com>
+
+        Rubber-stamped by Jon Honeycutt.
+
+        Fix a flakey test.
+
+        * fast/replaced/object-with-embed-url-param.html:
+
 2010-08-26  Dumitru Daniliuc  <dumi at chromium.org>
 
         Unreviewed, updating Chromium expectations.
diff --git a/LayoutTests/fast/replaced/object-with-embed-url-param.html b/LayoutTests/fast/replaced/object-with-embed-url-param.html
index ac44182..ec34270 100644
--- a/LayoutTests/fast/replaced/object-with-embed-url-param.html
+++ b/LayoutTests/fast/replaced/object-with-embed-url-param.html
@@ -6,25 +6,30 @@
                 layoutTestController.waitUntilDone();
             }
 
-            var handledObject1 = false;
-            var handledObject2 = false;
-            var handledEmbed3 = false;
+            var object1Result = "";
+            var object2Result = "";
+            var embed3Result = "";
 
             document.addEventListener("beforeload", function(event) {
+
+                if (event.url == "")
+                    return;
+ 
                 if (event.target.id == "object1") {
-                    debug("An &lt;object&gt; with a 'data' @attr and a 'src' &lt;param&gt; should load the URL from the 'data' @attr and does" + (event.url == "object-attr" ? "." : " not."));
-                    handledObject1 = true;
+                    object1Result = (event.url == "object-attr" ? "does" : "does not");
                 } else if (event.target.id == "object2") {
-                    debug("An &lt;object&gt; with a 'src' &lt;param&gt; should load the URL from the 'src' &lt;param&gt; and does" + (event.url == "object-param" ? "." : " not."));
-                    handledObject2 = true;
+                    object2Result = (event.url == "object-param" ? "does" : "does not");
                 } else if (event.target.id == "embed3") {
-                    debug("An &lt;object&gt; with no URL specified and a nested &lt;embed&gt; should load the URL from the 'src' @attr of the &lt;embed&gt; and does" + (event.url == "embed-attr" ? "." : " not."));
-                    handledEmbed3 = true;
+                    embed3Result = (event.url == "embed-attr" ? "does" : "does not");
                 }
 
-                if (window.layoutTestController && handledObject1 && handledObject2 && handledEmbed3)
-                    layoutTestController.notifyDone();
-
+                if (object1Result != "" && object2Result != "" && embed3Result != "") {
+                    debug("An &lt;object&gt; with a 'data' @attr and a 'src' &lt;param&gt; should load the URL from the 'data' @attr and " + object1Result + ".");
+                    debug("An &lt;object&gt; with a 'src' &lt;param&gt; should load the URL from the 'src' &lt;param&gt; and " + object2Result + ".");
+                    debug("An &lt;object&gt; with no URL specified and a nested &lt;embed&gt; should load the URL from the 'src' @attr of the &lt;embed&gt; and " + embed3Result + ".");
+                    if (window.layoutTestController)
+                        layoutTestController.notifyDone();
+                }
             }, true);
 
             function debug(str) {

-- 
WebKit Debian packaging