[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tony at chromium.org
tony at chromium.org
Wed Dec 22 13:43:06 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ce6f7e9b082c0eb5fd02a3ce45730cda99f1870d
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 23 23:35:58 2010 +0000
2010-09-23 Tony Chang <tony at chromium.org>
Reviewed by David Levin.
[chromium] make fast/events/standalone-image-drag-to-editable.html non-flakey
https://bugs.webkit.org/show_bug.cgi?id=46381
In chromium, the image that was dropped sometimes hasn't loaded when
the pixel results are taken. This results in a 0x0 image and makes
the test flakey. The fix is to wait for the image load event if it's
not already loaded.
* fast/events/resources/standalone-image-drag-to-editable-frame.html:
* fast/events/standalone-image-drag-to-editable.html:
* platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.checksum: Image result with dropped image loaded.
* platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.png:
* platform/chromium/test_expectations.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68213 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ae4d105..2baacc4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-23 Tony Chang <tony at chromium.org>
+
+ Reviewed by David Levin.
+
+ [chromium] make fast/events/standalone-image-drag-to-editable.html non-flakey
+ https://bugs.webkit.org/show_bug.cgi?id=46381
+
+ In chromium, the image that was dropped sometimes hasn't loaded when
+ the pixel results are taken. This results in a 0x0 image and makes
+ the test flakey. The fix is to wait for the image load event if it's
+ not already loaded.
+
+ * fast/events/resources/standalone-image-drag-to-editable-frame.html:
+ * fast/events/standalone-image-drag-to-editable.html:
+ * platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.checksum: Image result with dropped image loaded.
+ * platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.png:
+ * platform/chromium/test_expectations.txt:
+
2010-09-23 Mihai Parparita <mihaip at chromium.org>
Reviewed by Tony Chang.
diff --git a/LayoutTests/fast/events/resources/standalone-image-drag-to-editable-frame.html b/LayoutTests/fast/events/resources/standalone-image-drag-to-editable-frame.html
index 84dc92a..a725142 100644
--- a/LayoutTests/fast/events/resources/standalone-image-drag-to-editable-frame.html
+++ b/LayoutTests/fast/events/resources/standalone-image-drag-to-editable-frame.html
@@ -1,4 +1,21 @@
<html><body style='margin: 0 0 0 0;'><div style='height: 100px; border: solid 1px black;' contenteditable=true>
This layout test is checks that we don't crash when a stand alone image is dragged into a content editable div. <br />
<a href='rdar://problem/5021127'>rdar://problem/5021127</a>
-</div></body></html>
+</div></body>
+<script>
+function waitForImageLoad()
+{
+ if (!window.layoutTestController)
+ return;
+
+ var img = document.body.getElementsByTagName("img")[0];
+ if (img.width != 0)
+ layoutTestController.notifyDone();
+ else {
+ img.addEventListener("load", function() {
+ layoutTestController.notifyDone();
+ }, false);
+ }
+}
+</script>
+</html>
diff --git a/LayoutTests/fast/events/standalone-image-drag-to-editable.html b/LayoutTests/fast/events/standalone-image-drag-to-editable.html
index 31e5458..e5b9db3 100644
--- a/LayoutTests/fast/events/standalone-image-drag-to-editable.html
+++ b/LayoutTests/fast/events/standalone-image-drag-to-editable.html
@@ -10,6 +10,7 @@
eventSender.leapForward(500);
eventSender.mouseMoveTo(200, 50);
eventSender.mouseUp();
+ frames[0].waitForImageLoad();
}
var numFramesLoaded = 0;
function frameLoaded()
@@ -17,6 +18,8 @@
if (++numFramesLoaded == 2)
runTest();
}
+ if (window.layoutTestController)
+ layoutTestController.waitUntilDone();
</script>
<frameset rows="100px, 100px, *">
<frame onload="frameLoaded()" src="resources/standalone-image-drag-to-editable-frame.html">
diff --git a/LayoutTests/platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.checksum b/LayoutTests/platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.checksum
index f422fe2..6606a68 100644
--- a/LayoutTests/platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.checksum
@@ -1 +1 @@
-7429c38b94fe347b650e87fa3b75d41f
\ No newline at end of file
+b0912533e2471dd0f47bb205acbc2302
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.png b/LayoutTests/platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.png
index 0619147..d71950e 100644
Binary files a/LayoutTests/platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.png and b/LayoutTests/platform/chromium-linux/fast/events/standalone-image-drag-to-editable-expected.png differ
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 435947a..936ff16 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2315,12 +2315,6 @@ BUG36019 WIN LINUX : fast/images/svg-as-tiled-background.html = IMAGE
// WebKit roll 55250 to 55339
BUG36966 : fast/loader/about-blank-hash-kept.html = FAIL
-// Bugs that went unreported when we upstreamed run_webkit_tests
-// This one may be an actual regression! Started being flaky after
-// http://trac.webkit.org/log/?verbose=on&rev=55742&stop_rev=55710
-BUG37896 LINUX : fast/events/standalone-image-drag-to-editable.html = IMAGE IMAGE+TEXT PASS TEXT
-BUG37896 WIN : fast/events/standalone-image-drag-to-editable.html = IMAGE+TEXT PASS TEXT
-BUG37896 MAC DEBUG : fast/events/standalone-image-drag-to-editable.html = IMAGE+TEXT PASS
// New test, added http://trac.webkit.org/changeset/55546
BUG37896 WIN LINUX : fast/multicol/hit-test-above-or-below.html = TEXT
// Added in http://trac.webkit.org/changeset/55669
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list