[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 12:49:59 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4bbd97ffa60baa0c8ea1de0b11fa3843a6b35e0e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 31 09:56:27 2010 +0000
2010-08-31 Mihai Parparita <mihaip at chromium.org>
Reviewed by Adam Barth.
fast/dom/frame-loading-via-document-write.html fails on Chromium and is otherwise flaky
https://bugs.webkit.org/show_bug.cgi?id=44894
Detect all frames loading more reliably (add a counter to count down when each of
the three frames has loaded). Install onload handler on images instead of the document
to not tickle bug 29615.
* fast/dom/frame-loading-via-document-write.html:
* fast/dom/resources/frame-loading-via-document-write.js:
(didImageLoad):
* platform/chromium/test_expectations.txt:
* platform/mac-leopard/Skipped:
* platform/mac-snowleopard/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66472 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3911a16..48e039f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-08-31 Mihai Parparita <mihaip at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ fast/dom/frame-loading-via-document-write.html fails on Chromium and is otherwise flaky
+ https://bugs.webkit.org/show_bug.cgi?id=44894
+
+ Detect all frames loading more reliably (add a counter to count down when each of
+ the three frames has loaded). Install onload handler on images instead of the document
+ to not tickle bug 29615.
+
+ * fast/dom/frame-loading-via-document-write.html:
+ * fast/dom/resources/frame-loading-via-document-write.js:
+ (didImageLoad):
+ * platform/chromium/test_expectations.txt:
+ * platform/mac-leopard/Skipped:
+ * platform/mac-snowleopard/Skipped:
+
2010-08-27 John Gregg <johnnyg at google.com>
Reviewed by David Levin.
diff --git a/LayoutTests/fast/dom/frame-loading-via-document-write.html b/LayoutTests/fast/dom/frame-loading-via-document-write.html
index f14d44b..2e5c903 100644
--- a/LayoutTests/fast/dom/frame-loading-via-document-write.html
+++ b/LayoutTests/fast/dom/frame-loading-via-document-write.html
@@ -23,42 +23,53 @@ function buildFrameset()
document.close();
outHTML = "<html><head><scr" + "ipt language=\"JavaScript\" src=\"resources/frame-loading-via-document-write.js\">"+
- "</scr" + "ipt></head><body onLoad=\"clickAnchor()\"><table><tr><td>"+
+ "</scr" + "ipt></head><body onLoad=\"clickAnchor(); top.frameLoaded();\"><table><tr><td>"+
"<a href=\"resources/success.html\" target=\"topRow\" id=\"anchorLink\">Click me. If nothing loads above we have a problem.</a>"+
"</td></tr></table></body></html>";
frames['topRow'].document.open("text/html","replace");
frames['topRow'].document.charset=document.charset;
- frames['topRow'].document. write(outHTML);
+ frames['topRow'].document.write(outHTML);
frames['topRow'].document.close();
var localImageLocation = "file:////tmp/LayoutTests/fast/dom/resources/abe.png";
if (window.layoutTestController)
localImageLocation = layoutTestController.pathToLocalResource(localImageLocation);
+ // We check image loading via an onload handler on the <img> instead of the <body> because due to https://webkit.org/b/29615
+ // the document onload may fire before the image has loaded.
outHTML = "<html><head><scr" + "ipt language=\"JavaScript\" src=\"resources/frame-loading-via-document-write.js\">"+
- "</scr" + "ipt></head><body onLoad=\"didImageLoad()\"><table><tr><td>"+
+ "</scr" + "ipt></head><body><table><tr><td>"+
"<div id=\"result\"></div>"+
- "<img src=\"" + localImageLocation + "\" id=\"myImg\">"+
+ "<img src=\"" + localImageLocation + "\" id=\"myImg\" onLoad=\"didImageLoad(); top.frameLoaded();\">"+
"</td></tr></table></body></html>";
frames['middleRow'].document.open("text/html","replace");
frames['middleRow'].document.charset=document.charset;
- frames['middleRow'].document. write(outHTML);
+ frames['middleRow'].document.write(outHTML);
frames['middleRow'].document.close();
outHTML = "<html><head><scr" + "ipt language=\"JavaScript\" src=\"resources/frame-loading-via-document-write.js\">"+
- "</scr" + "ipt></head><body onLoad=\"lastTest()\"><table><tr><td>"+
+ "</scr" + "ipt></head><body><table><tr><td>"+
"<div id=\"result\"></div>"+
- "<img src=\"resources/abe.png\" id=\"myImg\">"+
+ "<img src=\"resources/abe.png\" id=\"myImg\" onLoad=\"didImageLoad(); top.frameLoaded();\">"+
"</td></tr></table></body></html>";
frames['bottomRow'].document.open("text/html","replace");
frames['bottomRow'].document.charset=document.charset;
- frames['bottomRow'].document. write(outHTML);
+ frames['bottomRow'].document.write(outHTML);
frames['bottomRow'].document.close();
}
+var frameLoadCounter = 3;
+
+function frameLoaded()
+{
+ frameLoadCounter--;
+ if (frameLoadCounter == 0 && window.layoutTestController)
+ layoutTestController.notifyDone();
+}
+
buildFrameset();
</script>
diff --git a/LayoutTests/fast/dom/resources/frame-loading-via-document-write.js b/LayoutTests/fast/dom/resources/frame-loading-via-document-write.js
index c879a9e..3a7a227 100644
--- a/LayoutTests/fast/dom/resources/frame-loading-via-document-write.js
+++ b/LayoutTests/fast/dom/resources/frame-loading-via-document-write.js
@@ -16,12 +16,3 @@ function didImageLoad()
result.innerHTML = "Image loaded.";
}
}
-
-function lastTest()
-{
- didImageLoad();
-
- if (window.layoutTestController)
- layoutTestController.notifyDone();
-}
-
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 710b564..ee8fa0d 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -533,14 +533,6 @@ WONTFIX SKIP : transforms/3d = FAIL
// Also skipped by Apple on Windows (rdar://problem/5015941)
BUG20404 : editing/execCommand/copy-without-selection.html = FAIL
-// This is a faulty test and need to change so it works on Windows.
-// onload race condition due to poorly designed test.
-// Works fine when run stand-alone. Not needed for Beta.
-// Also skipped by Apple on Windows, due to intermittent failure
-// (rdar://5313536)
-// started WIN only, since r30442 fails on all platforms
-BUG10270 : fast/dom/frame-loading-via-document-write.html = FAIL
-
// -----------------------------------------------------------------
// LIGHTTPD
// -----------------------------------------------------------------
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 469a733..ed16dcd 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -1,5 +1,4 @@
# <rdar://problem/5313536> frame-loading-via-document-write.html sometimes fails on Leopard
-fast/dom/frame-loading-via-document-write.html
http/tests/security/frame-loading-via-document-write.html
# <rdar://problem/5686552> svg/css/glyph-orientation-rounding-test.xhtml sometimes fails
diff --git a/LayoutTests/platform/mac-snowleopard/Skipped b/LayoutTests/platform/mac-snowleopard/Skipped
index 61de729..fd89c17 100644
--- a/LayoutTests/platform/mac-snowleopard/Skipped
+++ b/LayoutTests/platform/mac-snowleopard/Skipped
@@ -61,9 +61,6 @@ media/video-controls-zoomed.html
media/video-zoom-controls.html
media/video-display-toggle.html
-#<rdar://problem/7135864> - Intermittent failure
-fast/dom/frame-loading-via-document-write.html
-
#<rdar://problem/7144385> - media/controls-drag-timebar.html fails
media/controls-drag-timebar.html
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list