[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
philn at webkit.org
philn at webkit.org
Fri Jan 21 14:41:49 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 7dd26e66e25fcf81a960f69735953d1bfefd9e2c
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 24 20:57:13 2010 +0000
2010-12-24 Philippe Normand <pnormand at igalia.com>
Unreviewed, updated GTK media tests baselines after r74643.
* platform/gtk/media/audio-controls-rendering-expected.txt:
* platform/gtk/media/controls-after-reload-expected.txt:
* platform/gtk/media/controls-strict-expected.txt:
* platform/gtk/media/controls-styling-expected.txt:
* platform/gtk/media/video-controls-rendering-expected.txt:
* platform/gtk/media/video-display-toggle-expected.txt:
* platform/gtk/media/video-empty-source-expected.txt:
* platform/gtk/media/video-no-audio-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74651 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4f4aa86..9f4afb3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-24 Philippe Normand <pnormand at igalia.com>
+
+ Unreviewed, updated GTK media tests baselines after r74643.
+
+ * platform/gtk/media/audio-controls-rendering-expected.txt:
+ * platform/gtk/media/controls-after-reload-expected.txt:
+ * platform/gtk/media/controls-strict-expected.txt:
+ * platform/gtk/media/controls-styling-expected.txt:
+ * platform/gtk/media/video-controls-rendering-expected.txt:
+ * platform/gtk/media/video-display-toggle-expected.txt:
+ * platform/gtk/media/video-empty-source-expected.txt:
+ * platform/gtk/media/video-no-audio-expected.txt:
+
2010-12-24 Darin Adler <darin at apple.com>
Rebased Leopard to expect the same kind of stack failure
diff --git a/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt
index 72a15f7..2143e91 100644
--- a/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt
+++ b/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt
@@ -16,22 +16,30 @@ layer at (0,0) size 800x600
RenderBR {BR} at (0,78) size 0x19
layer at (8,43) size 300x20
RenderBlock (relative positioned) {DIV} at (0,0) size 300x20
-layer at (8,43) size 300x20
+layer at (8,43) size 300x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,0) size 300x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 218x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:07"
+ RenderSlider {INPUT} at (66,0) size 153x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
RenderButton {INPUT} at (280,0) size 20x20
layer at (8,82) size 320x20
RenderBlock (relative positioned) {DIV} at (0,0) size 320x20
-layer at (8,82) size 320x20
+layer at (8,82) size 320x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,0) size 320x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 240x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 238x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:07"
+ RenderSlider {INPUT} at (66,0) size 173x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (260,0) size 20x20
RenderButton {INPUT} at (280,0) size 20x20
@@ -40,11 +48,15 @@ layer at (8,121) size 320x100
RenderMedia {AUDIO} at (8,121) size 320x100 [bgcolor=#0000FF]
layer at (8,121) size 320x100
RenderBlock (relative positioned) {DIV} at (0,0) size 320x100
-layer at (8,201) size 320x20
+layer at (8,201) size 320x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,80) size 320x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 240x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 238x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:07"
+ RenderSlider {INPUT} at (66,0) size 173x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (260,0) size 20x20
RenderButton {INPUT} at (280,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt b/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
index 3fd14b8..e052c9d 100644
--- a/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-after-reload-expected.txt
@@ -12,11 +12,15 @@ layer at (8,43) size 320x240
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,43) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,263) size 320x20
+layer at (8,263) size 320x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 218x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:00"
+ RenderSlider {INPUT} at (66,0) size 153x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/controls-strict-expected.txt b/LayoutTests/platform/gtk/media/controls-strict-expected.txt
index b418e30..c234269 100644
--- a/LayoutTests/platform/gtk/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-strict-expected.txt
@@ -12,11 +12,15 @@ layer at (8,51) size 320x240
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,51) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,271) size 320x20
+layer at (8,271) size 320x20 scrollHeight 31
RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 218x20
+ RenderBlock (anonymous) at (1,0) size 65x31
+ RenderBlock {DIV} at (0,1) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:06"
+ RenderSlider {INPUT} at (66,0) size 153x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/controls-styling-expected.txt b/LayoutTests/platform/gtk/media/controls-styling-expected.txt
index 3df4e2b..71f0af5 100644
--- a/LayoutTests/platform/gtk/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/gtk/media/controls-styling-expected.txt
@@ -16,11 +16,17 @@ layer at (8,283) size 320x240
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (18,43) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (18,263) size 320x20
+layer at (18,263) size 320x20 scrollHeight 261
RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 218x20
+ RenderBlock (anonymous) at (1,0) size 218x30
+ RenderBlock {DIV} at (10,0) size 218x30
+ RenderText {#text} at (27,49) size 178x212
+ text run at (27,49) width 173: "00:00"
+ text run at (92,149) width 33: "/"
+ text run at (22,249) width 173: "00:06"
+ RenderSlider {INPUT} at (219,0) size 4x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
@@ -28,11 +34,15 @@ layer at (18,263) size 320x20
RenderButton {INPUT} at (300,0) size 20x20
layer at (8,283) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,503) size 320x20
+layer at (8,503) size 320x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 218x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:06"
+ RenderSlider {INPUT} at (66,0) size 153x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt b/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt
index a26089a..ecc1156 100644
--- a/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-controls-rendering-expected.txt
@@ -17,11 +17,15 @@ layer at (8,283) size 320x240
RenderVideo {VIDEO} at (0,0) size 320x240
layer at (8,43) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,263) size 320x20
+layer at (8,263) size 320x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 218x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:06"
+ RenderSlider {INPUT} at (66,0) size 153x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
@@ -29,11 +33,15 @@ layer at (8,263) size 320x20
RenderButton {INPUT} at (300,0) size 20x20
layer at (8,283) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,503) size 320x20
+layer at (8,503) size 320x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 218x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:06"
+ RenderSlider {INPUT} at (66,0) size 153x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
@@ -43,11 +51,15 @@ layer at (8,523) size 320x240
RenderVideo {VIDEO} at (8,523) size 320x240
layer at (8,523) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,743) size 320x20
+layer at (8,743) size 320x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 218x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:06"
+ RenderSlider {INPUT} at (66,0) size 153x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt b/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt
index c61fffd..f4023e7 100644
--- a/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt
@@ -11,11 +11,15 @@ layer at (8,27) size 320x240
RenderVideo {VIDEO} at (0,19) size 320x240
layer at (8,27) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,247) size 320x20
+layer at (8,247) size 320x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,220) size 320x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 220x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 218x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:06"
+ RenderSlider {INPUT} at (66,0) size 153x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (240,0) size 20x20
RenderButton {INPUT} at (260,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/video-empty-source-expected.txt b/LayoutTests/platform/gtk/media/video-empty-source-expected.txt
index e3b44b0..b4b8751 100644
--- a/LayoutTests/platform/gtk/media/video-empty-source-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-empty-source-expected.txt
@@ -12,11 +12,15 @@ layer at (8,43) size 302x152
RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
layer at (9,44) size 300x150
RenderBlock (relative positioned) {DIV} at (1,1) size 300x150
-layer at (9,174) size 300x20
+layer at (9,174) size 300x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,130) size 300x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 240x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 238x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:00"
+ RenderSlider {INPUT} at (66,0) size 173x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (260,0) size 20x20
RenderButton {INPUT} at (280,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/video-no-audio-expected.txt b/LayoutTests/platform/gtk/media/video-no-audio-expected.txt
index 8f274e2..c15a5a7 100644
--- a/LayoutTests/platform/gtk/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/gtk/media/video-no-audio-expected.txt
@@ -12,11 +12,15 @@ layer at (8,43) size 352x288
RenderVideo {VIDEO} at (0,0) size 352x288
layer at (8,43) size 352x288
RenderBlock (relative positioned) {DIV} at (0,0) size 352x288
-layer at (8,311) size 352x20
+layer at (8,311) size 352x20 scrollHeight 30
RenderFlexibleBox (positioned) {DIV} at (0,268) size 352x20
RenderButton {INPUT} at (0,0) size 20x20
RenderFlexibleBox {DIV} at (20,0) size 272x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
- RenderSlider {INPUT} at (1,0) size 270x20
+ RenderBlock (anonymous) at (1,0) size 65x30
+ RenderBlock {DIV} at (0,0) size 65x30
+ RenderText {#text} at (5,5) size 55x12
+ text run at (5,5) width 55: "00:00 / 00:09"
+ RenderSlider {INPUT} at (66,0) size 205x20
RenderBlock {DIV} at (2,4) size 12x12
RenderButton {INPUT} at (292,0) size 20x20
RenderButton {INPUT} at (312,0) size 20x20
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list