[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
mrobinson at webkit.org
mrobinson at webkit.org
Fri Jan 21 15:09:56 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit e7f0902b2fca4587b90357b907aa689ceef8e3a7
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 8 01:38:12 2011 +0000
2011-01-07 Martin Robinson <mrobinson at igalia.com>
Reviewed by Mihai Parparita.
fast/dom/Window/window-postmessage-clone-frames.html has some timing issues
https://bugs.webkit.org/show_bug.cgi?id=52032
Fix the timing issue in fast/dom/Window/window-postmessage-clone-frames.html
and move the output console div beyond the file input control, so that output
text does not push it outside the viewport.
* fast/dom/Window/window-postmessage-clone-frames-expected.txt: Updated results
to reflect div movement.
* fast/dom/Window/window-postmessage-clone-frames.html: Fix the timing and
layout issues with this test.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75298 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2356565..efdc335 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-07 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Mihai Parparita.
+
+ fast/dom/Window/window-postmessage-clone-frames.html has some timing issues
+ https://bugs.webkit.org/show_bug.cgi?id=52032
+
+ Fix the timing issue in fast/dom/Window/window-postmessage-clone-frames.html
+ and move the output console div beyond the file input control, so that output
+ text does not push it outside the viewport.
+
+ * fast/dom/Window/window-postmessage-clone-frames-expected.txt: Updated results
+ to reflect div movement.
+ * fast/dom/Window/window-postmessage-clone-frames.html: Fix the timing and
+ layout issues with this test.
+
2011-01-07 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Ojan Vafai.
diff --git a/LayoutTests/fast/dom/Window/window-postmessage-clone-frames-expected.txt b/LayoutTests/fast/dom/Window/window-postmessage-clone-frames-expected.txt
index 63db6f2..13749cf 100644
--- a/LayoutTests/fast/dom/Window/window-postmessage-clone-frames-expected.txt
+++ b/LayoutTests/fast/dom/Window/window-postmessage-clone-frames-expected.txt
@@ -1,4 +1,5 @@
Tests that we clone object hierarchies
+
PASS: (frames[0].tests[0]).eventData instanceof (frames[0]).Object is true of type boolean
PASS: (frames[0].tests[0]).event.data instanceof (frames[0]).Object is true of type boolean
PASS: (frames[0].tests[1]).eventData instanceof (frames[0]).Array is true of type boolean
@@ -9,4 +10,4 @@ PASS: (frames[0].tests[3]).eventData instanceof (frames[0]).File is true of type
PASS: (frames[0].tests[3]).event.data instanceof (frames[0]).File is true of type boolean
PASS: (frames[0].tests[4]).eventData instanceof (frames[0]).FileList is true of type boolean
PASS: (frames[0].tests[4]).event.data instanceof (frames[0]).FileList is true of type boolean
-
+
diff --git a/LayoutTests/fast/dom/Window/window-postmessage-clone-frames.html b/LayoutTests/fast/dom/Window/window-postmessage-clone-frames.html
index bf891d6..4196561 100644
--- a/LayoutTests/fast/dom/Window/window-postmessage-clone-frames.html
+++ b/LayoutTests/fast/dom/Window/window-postmessage-clone-frames.html
@@ -2,8 +2,8 @@
<head></head>
<body>
<div id="description"></div>
-<div id="console"></div>
<input type="file" id="fileInput">
+<div id="console"></div>
<iframe src="resources/window-postmessage-clone-frames-frame.html" onload="startTest()"></iframe>
<script>
if (window.layoutTestController) {
@@ -76,11 +76,15 @@ function shouldBe(actual, expected)
}
var i = 0;
window.onmessage = function(evt) {
+ if (safeToString(frames[0].tests[i].eventData) == 'done') {
+ if (window.layoutTestController)
+ layoutTestController.notifyDone();
+ return;
+ }
+
shouldBe("(frames[0].tests["+i+"]).eventData instanceof (frames[0])."+tests[i].constructor, "true");
shouldBe("(frames[0].tests["+i+"]).event.data instanceof (frames[0])."+tests[i].constructor, "true");
i++;
- if (tests.length === i && window.layoutTestController)
- layoutTestController.notifyDone();
}
function tryPostMessage(message, constructor) {
@@ -110,6 +114,7 @@ function startTest() {
tryPostMessage('fileInput.files[0]', "File");
tryPostMessage('fileInput.files', "FileList");
}
+ tryPostMessage('"done"');
}
</script>
</body>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list