[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
simon.fraser at apple.com
simon.fraser at apple.com
Wed Apr 7 23:59:51 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 1f07c2f1acec81a39c0e6b88064a7a1221a51f98
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 30 03:45:56 2009 +0000
2009-11-29 Simon Fraser <simon.fraser at apple.com>
Rubber-stamped by Eric Seidel.
Fix up some compositing layout tests.
* compositing/layers-inside-overflow-scroll.html:
* compositing/self-painting-layers.html:
Use the 'loadeddata' event, instead of 'load', to know when the video loads.
* platform/mac/compositing/repaint/content-into-overflow-expected.checksum:
* platform/mac/compositing/repaint/content-into-overflow-expected.png:
* platform/mac/compositing/repaint/overflow-into-content-expected.checksum:
* platform/mac/compositing/repaint/overflow-into-content-expected.png:
* platform/mac/compositing/self-painting-layers-expected.checksum:
* platform/mac/compositing/self-painting-layers-expected.png:
Update with correct pixel results.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51478 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 56d6d29..e808a8c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2009-11-29 Simon Fraser <simon.fraser at apple.com>
+
+ Rubber-stamped by Eric Seidel.
+
+ Fix up some compositing layout tests.
+
+ * compositing/layers-inside-overflow-scroll.html:
+ * compositing/self-painting-layers.html:
+ Use the 'loadeddata' event, instead of 'load', to know when the video loads.
+
+ * platform/mac/compositing/repaint/content-into-overflow-expected.checksum:
+ * platform/mac/compositing/repaint/content-into-overflow-expected.png:
+ * platform/mac/compositing/repaint/overflow-into-content-expected.checksum:
+ * platform/mac/compositing/repaint/overflow-into-content-expected.png:
+ * platform/mac/compositing/self-painting-layers-expected.checksum:
+ * platform/mac/compositing/self-painting-layers-expected.png:
+ Update with correct pixel results.
+
2009-11-29 Shu Chang <Chang.Shu at nokia.com>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/compositing/layers-inside-overflow-scroll.html b/LayoutTests/compositing/layers-inside-overflow-scroll.html
index a83384a..aa66c13 100644
--- a/LayoutTests/compositing/layers-inside-overflow-scroll.html
+++ b/LayoutTests/compositing/layers-inside-overflow-scroll.html
@@ -47,14 +47,16 @@
}
window.addEventListener('load', function() {
- document.getElementById('video').src = "resources/video.mp4";
+ var video = document.getElementById('video');
+ video.addEventListener('loadeddata', testOnLoad, false);
+ video.src = "resources/video.mp4";
}, false);
</script>
</head>
<body>
<p>The red box in the overflow:scroll div should be scrolled out of view.</p>
<div id="container">
- <video id="video" width="300" height="200" onload="testOnLoad()"></video>
+ <video id="video" width="300" height="200"></video>
</div>
<div id="details">
diff --git a/LayoutTests/compositing/self-painting-layers.html b/LayoutTests/compositing/self-painting-layers.html
index 21e2b12..c8ae079 100644
--- a/LayoutTests/compositing/self-painting-layers.html
+++ b/LayoutTests/compositing/self-painting-layers.html
@@ -41,14 +41,16 @@
}
window.addEventListener('load', function() {
- document.getElementById('video').src = "resources/video.mp4";
+ var video = document.getElementById('video');
+ video.addEventListener('loadeddata', testOnLoad, false);
+ video.src = "resources/video.mp4";
}, false);
</script>
</head>
<body>
<p>You should not see double text when the div scrolls</p>
<div id="container">
- <video id="video" width="300" height="200" onload="testOnLoad()"></video>
+ <video id="video" width="300" height="200"></video>
</div>
<div id="details">
diff --git a/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.checksum b/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.checksum
index 9811929..abde0d3 100644
--- a/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.checksum
+++ b/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.checksum
@@ -1 +1 @@
-08002b5ac3ddd8d6624ba23fad2ae137
\ No newline at end of file
+22501d793ce2eeb0883d9c6dd74794b1
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.png b/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.png
index df6ac63..a8859f5 100644
Binary files a/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.png and b/LayoutTests/platform/mac/compositing/repaint/content-into-overflow-expected.png differ
diff --git a/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.checksum b/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.checksum
index abde0d3..9811929 100644
--- a/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.checksum
+++ b/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.checksum
@@ -1 +1 @@
-22501d793ce2eeb0883d9c6dd74794b1
\ No newline at end of file
+08002b5ac3ddd8d6624ba23fad2ae137
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.png b/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.png
index a8859f5..df6ac63 100644
Binary files a/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.png and b/LayoutTests/platform/mac/compositing/repaint/overflow-into-content-expected.png differ
diff --git a/LayoutTests/platform/mac/compositing/self-painting-layers-expected.checksum b/LayoutTests/platform/mac/compositing/self-painting-layers-expected.checksum
index a247c40..be6a820 100644
--- a/LayoutTests/platform/mac/compositing/self-painting-layers-expected.checksum
+++ b/LayoutTests/platform/mac/compositing/self-painting-layers-expected.checksum
@@ -1 +1 @@
-a0e32184dbf381d26f3f4ee534a82957
\ No newline at end of file
+df6e3a740bc6c742712dab27d7d54dd0
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/compositing/self-painting-layers-expected.png b/LayoutTests/platform/mac/compositing/self-painting-layers-expected.png
index 1adf869..b07b62f 100644
Binary files a/LayoutTests/platform/mac/compositing/self-painting-layers-expected.png and b/LayoutTests/platform/mac/compositing/self-painting-layers-expected.png differ
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list