[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
cmarrin at apple.com
cmarrin at apple.com
Thu Apr 8 00:58:42 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 7fd5af6be0eefc6dc16ea302ddca495111ef1bde
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 8 21:11:44 2010 +0000
Fixed media test failures caused by http://trac.webkit.org/changeset/52998.
The media controller on Windows now has a full-screen button, which changes
the layout and therefore the test results. I regenerated them for
Windows.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53003 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2fe6b2c..b801221 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-08 Chris Marrin <cmarrin at apple.com>
+
+ Fixed media test failures caused by http://trac.webkit.org/changeset/52998.
+ The media controller on Windows now has a full-screen button, which changes
+ the layout and therefore the test results. I regenerated them for
+ Windows.
+
+ * platform/win/media/controls-after-reload-expected.txt:
+ * platform/win/media/controls-drag-timebar-expected.txt:
+ * platform/win/media/controls-strict-expected.txt:
+ * platform/win/media/controls-styling-expected.txt:
+ * platform/win/media/video-controls-rendering-expected.txt:
+ * platform/win/media/video-display-toggle-expected.txt:
+ * platform/win/media/video-no-audio-expected.txt:
+
2010-01-08 Brian Weinstein <bweinstein at apple.com>
Rubber-stamped by Adam Roben.
diff --git a/LayoutTests/platform/win/media/controls-after-reload-expected.txt b/LayoutTests/platform/win/media/controls-after-reload-expected.txt
index 923fac3..a433cf6 100644
--- a/LayoutTests/platform/win/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/win/media/controls-after-reload-expected.txt
@@ -17,9 +17,10 @@ layer at (8,42) size 320x240
layer at (8,266) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
+ RenderFlexibleBox {DIV} at (16,0) size 240x16
+ RenderSlider {INPUT} at (0,0) size 240x16
RenderBlock {DIV} at (2,1) size 13x14
+ RenderButton {INPUT} at (256,0) size 16x16
RenderButton {INPUT} at (272,0) size 16x16
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
diff --git a/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt b/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
index 3231085..b7dbe1d 100644
--- a/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
+++ b/LayoutTests/platform/win/media/controls-drag-timebar-expected.txt
@@ -4,10 +4,10 @@ RUN(video.autoplay = true)
RUN(video.src = 'content/test.mp4')
EVENT(playing)
EVENT(seeked)
-Time: 2.1
+Time: 2.3
EVENT(seeked)
-Time: 2.6
+Time: 2.8
EVENT(seeked)
-Time: 3.1
+Time: 3.4
END OF TEST
diff --git a/LayoutTests/platform/win/media/controls-strict-expected.txt b/LayoutTests/platform/win/media/controls-strict-expected.txt
index 5296d55..45db871 100644
--- a/LayoutTests/platform/win/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/win/media/controls-strict-expected.txt
@@ -17,9 +17,10 @@ layer at (8,50) size 320x240
layer at (8,274) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
+ RenderFlexibleBox {DIV} at (16,0) size 240x16
+ RenderSlider {INPUT} at (0,0) size 240x16
RenderBlock {DIV} at (2,1) size 13x14
+ RenderButton {INPUT} at (256,0) size 16x16
RenderButton {INPUT} at (272,0) size 16x16
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
diff --git a/LayoutTests/platform/win/media/controls-styling-expected.txt b/LayoutTests/platform/win/media/controls-styling-expected.txt
index fd24373..507123f 100644
--- a/LayoutTests/platform/win/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/win/media/controls-styling-expected.txt
@@ -21,9 +21,10 @@ layer at (18,42) size 320x240
layer at (18,266) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
+ RenderFlexibleBox {DIV} at (16,0) size 240x16
+ RenderSlider {INPUT} at (0,0) size 240x16
RenderBlock {DIV} at (2,1) size 13x14
+ RenderButton {INPUT} at (256,0) size 16x16
RenderButton {INPUT} at (272,0) size 16x16
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
@@ -32,9 +33,10 @@ layer at (8,282) size 320x240
layer at (8,506) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
+ RenderFlexibleBox {DIV} at (16,0) size 240x16
+ RenderSlider {INPUT} at (0,0) size 240x16
RenderBlock {DIV} at (2,1) size 13x14
+ RenderButton {INPUT} at (256,0) size 16x16
RenderButton {INPUT} at (272,0) size 16x16
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
diff --git a/LayoutTests/platform/win/media/video-controls-rendering-expected.txt b/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
index fff11e1..791807e 100644
--- a/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/win/media/video-controls-rendering-expected.txt
@@ -20,9 +20,10 @@ layer at (8,42) size 320x240
layer at (8,266) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
+ RenderFlexibleBox {DIV} at (16,0) size 240x16
+ RenderSlider {INPUT} at (0,0) size 240x16
RenderBlock {DIV} at (2,1) size 13x14
+ RenderButton {INPUT} at (256,0) size 16x16
RenderButton {INPUT} at (272,0) size 16x16
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
@@ -31,9 +32,10 @@ layer at (8,282) size 320x240
layer at (8,506) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
+ RenderFlexibleBox {DIV} at (16,0) size 240x16
+ RenderSlider {INPUT} at (0,0) size 240x16
RenderBlock {DIV} at (2,1) size 13x14
+ RenderButton {INPUT} at (256,0) size 16x16
RenderButton {INPUT} at (272,0) size 16x16
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
@@ -44,9 +46,10 @@ layer at (8,522) size 320x240
layer at (8,746) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
+ RenderFlexibleBox {DIV} at (16,0) size 240x16
+ RenderSlider {INPUT} at (0,0) size 240x16
RenderBlock {DIV} at (2,1) size 13x14
+ RenderButton {INPUT} at (256,0) size 16x16
RenderButton {INPUT} at (272,0) size 16x16
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
diff --git a/LayoutTests/platform/win/media/video-display-toggle-expected.txt b/LayoutTests/platform/win/media/video-display-toggle-expected.txt
index a9baa00..a4f8539 100644
--- a/LayoutTests/platform/win/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/win/media/video-display-toggle-expected.txt
@@ -16,9 +16,10 @@ layer at (8,26) size 320x240
layer at (8,250) size 320x16
RenderFlexibleBox (positioned) {DIV} at (0,224) size 320x16
RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 256x16
- RenderSlider {INPUT} at (0,0) size 256x16
+ RenderFlexibleBox {DIV} at (16,0) size 240x16
+ RenderSlider {INPUT} at (0,0) size 240x16
RenderBlock {DIV} at (2,1) size 13x14
+ RenderButton {INPUT} at (256,0) size 16x16
RenderButton {INPUT} at (272,0) size 16x16
RenderButton {INPUT} at (288,0) size 16x16
RenderButton {INPUT} at (304,0) size 16x16
diff --git a/LayoutTests/platform/win/media/video-no-audio-expected.txt b/LayoutTests/platform/win/media/video-no-audio-expected.txt
index f0872fc..54006bf 100644
--- a/LayoutTests/platform/win/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/win/media/video-no-audio-expected.txt
@@ -17,8 +17,9 @@ layer at (8,42) size 640x480
layer at (8,506) size 640x16
RenderFlexibleBox (positioned) {DIV} at (0,464) size 640x16
RenderButton {INPUT} at (0,0) size 16x16
- RenderFlexibleBox {DIV} at (16,0) size 592x16
- RenderSlider {INPUT} at (0,0) size 592x16
+ RenderFlexibleBox {DIV} at (16,0) size 576x16
+ RenderSlider {INPUT} at (0,0) size 576x16
RenderBlock {DIV} at (2,1) size 13x14
+ RenderButton {INPUT} at (592,0) size 16x16
RenderButton {INPUT} at (608,0) size 16x16
RenderButton {INPUT} at (624,0) size 16x16
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list