[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
philn at webkit.org
philn at webkit.org
Wed Dec 22 11:57:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 118cbe4444950ea3300da102c5bad810ad3418e7
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 12 08:24:07 2010 +0000
2010-08-12 Philippe Normand <pnormand at igalia.com>
Reviewed by Martin Robinson.
[GTK] new media tests baselines needed
https://bugs.webkit.org/show_bug.cgi?id=42444
Visually check those tests, they seemed fine to me so I added
their baselines.
* platform/gtk/Skipped:
* platform/gtk/media/audio-controls-rendering-expected.txt: Added.
* platform/gtk/media/video-display-toggle-expected.txt: Added.
* platform/gtk/media/video-empty-source-expected.txt: Added.
* platform/gtk/media/video-layer-crash-expected.txt: Added.
* platform/gtk/media/video-no-audio-expected.txt: Added.
* platform/gtk/media/video-transformed-expected.txt: Added.
* platform/gtk/media/video-zoom-controls-expected.txt: Added.
* platform/gtk/media/video-zoom-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65224 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 746093f..e354c2d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2010-08-12 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] new media tests baselines needed
+ https://bugs.webkit.org/show_bug.cgi?id=42444
+
+ Visually check those tests, they seemed fine to me so I added
+ their baselines.
+
+ * platform/gtk/Skipped:
+ * platform/gtk/media/audio-controls-rendering-expected.txt: Added.
+ * platform/gtk/media/video-display-toggle-expected.txt: Added.
+ * platform/gtk/media/video-empty-source-expected.txt: Added.
+ * platform/gtk/media/video-layer-crash-expected.txt: Added.
+ * platform/gtk/media/video-no-audio-expected.txt: Added.
+ * platform/gtk/media/video-transformed-expected.txt: Added.
+ * platform/gtk/media/video-zoom-controls-expected.txt: Added.
+ * platform/gtk/media/video-zoom-expected.txt: Added.
+
2010-08-11 Sam Weinig <sam at webkit.org>
Rubber-stamped by Jon Honeycutt.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 480169c..0e7251f 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -3267,15 +3267,7 @@ media/video-seek-past-end-playing.html
media/video-source-error.html
# Tests generating new results
-media/audio-controls-rendering.html
media/video-aspect-ratio.html
-media/video-display-toggle.html
-media/video-empty-source.html
-media/video-layer-crash.html
-media/video-no-audio.html
-media/video-transformed.html
-media/video-zoom-controls.html
-media/video-zoom.html
# This test requires media controls has a volume slider.
media/video-volume-slider.html
# Tests requiring fullscreen <video> support
@@ -5134,7 +5126,6 @@ fast/repaint/line-in-scrolled-clipped-block.html
fast/repaint/positioned-document-element.html
fast/text/international/khmer-selection.html
fast/text/text-letter-spacing.html
-media/audio-no-installed-engines.html
svg/batik/filters/feTile.svg
svg/custom/createImageElement.svg
svg/custom/createImageElement2.xhtml
diff --git a/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt b/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt
new file mode 100644
index 0000000..1276a9a
--- /dev/null
+++ b/LayoutTests/platform/gtk/media/audio-controls-rendering-expected.txt
@@ -0,0 +1,51 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 153x20
+ text run at (0,0) width 153: "Test controls placement."
+ RenderBlock (anonymous) at (0,36) size 784x100
+ RenderMedia {AUDIO} at (0,0) size 300x20 [bgcolor=#0000FF]
+ RenderBR {BR} at (300,20) size 0x0
+ RenderBR {BR} at (0,20) size 0x20
+ RenderMedia {AUDIO} at (0,40) size 320x20 [bgcolor=#0000FF]
+ RenderBR {BR} at (320,60) size 0x0
+ RenderBR {BR} at (0,60) size 0x20
+ RenderBR {BR} at (0,80) size 0x20
+layer at (8,44) size 300x20
+ RenderBlock (relative positioned) {DIV} at (0,0) size 300x20
+layer at (8,44) size 300x20
+ 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 {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,84) size 320x20
+ RenderBlock (relative positioned) {DIV} at (0,0) size 320x20
+layer at (8,84) size 320x20
+ 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 {DIV} at (2,4) size 12x12
+ RenderButton {INPUT} at (260,0) size 20x20
+ RenderButton {INPUT} at (280,0) size 20x20
+ RenderButton {INPUT} at (300,0) size 20x20
+layer at (8,124) size 320x100
+ RenderMedia {AUDIO} at (8,124) size 320x100 [bgcolor=#0000FF]
+layer at (8,124) size 320x100
+ RenderBlock (relative positioned) {DIV} at (0,0) size 320x100
+layer at (8,204) size 320x20
+ 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 {DIV} at (2,4) size 12x12
+ RenderButton {INPUT} at (260,0) size 20x20
+ RenderButton {INPUT} at (280,0) size 20x20
+ RenderButton {INPUT} at (300,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
new file mode 100644
index 0000000..19e092f
--- /dev/null
+++ b/LayoutTests/platform/gtk/media/video-display-toggle-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderText {#text} at (0,0) size 493x20
+ text run at (0,0) width 493: "This tests that toggling the display property won't make the controls disappear."
+ RenderBR {BR} at (493,15) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,28) size 320x240
+ RenderVideo {VIDEO} at (0,20) size 320x240
+layer at (8,28) size 320x240
+ RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
+layer at (8,248) size 320x20
+ RenderFlexibleBox (positioned) {DIV} at (0,220) 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 {DIV} at (2,4) size 12x12
+ RenderButton {INPUT} at (260,0) size 20x20
+ RenderButton {INPUT} at (280,0) size 20x20
+ RenderButton {INPUT} at (300,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
new file mode 100644
index 0000000..a93bbf1
--- /dev/null
+++ b/LayoutTests/platform/gtk/media/video-empty-source-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 430x20
+ text run at (0,0) width 430: "Slider drawing with no source. The controls should render correctly."
+ RenderBlock (anonymous) at (0,36) size 784x152
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,44) size 302x152
+ RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
+layer at (9,45) size 300x150
+ RenderBlock (relative positioned) {DIV} at (1,1) size 300x150
+layer at (9,175) size 300x20
+ 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 {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-layer-crash-expected.txt b/LayoutTests/platform/gtk/media/video-layer-crash-expected.txt
new file mode 100644
index 0000000..025d5f3
--- /dev/null
+++ b/LayoutTests/platform/gtk/media/video-layer-crash-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 360x20
+ text run at (0,0) width 360: "Test dynamic removal of transformed and reflected video"
+ RenderBlock (anonymous) at (0,36) size 784x342
+ RenderText {#text} at (0,0) size 4x20
+ text run at (0,0) width 4: " "
+ RenderBR {BR} at (4,15) size 0x0
+ RenderText {#text} at (0,161) size 4x20
+ text run at (0,161) width 4: " "
+ RenderBR {BR} at (210,176) size 0x0
+ RenderText {#text} at (0,322) size 4x20
+ text run at (0,322) width 4: " "
+ RenderBR {BR} at (210,337) size 0x0
+layer at (12,64) size 206x156
+ RenderVideo {VIDEO} at (4,20) size 206x156 [border: (3px solid #FF0000)]
+layer at (12,225) size 206x156
+ RenderVideo {VIDEO} at (4,181) size 206x156 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/gtk/media/video-no-audio-expected.txt b/LayoutTests/platform/gtk/media/video-no-audio-expected.txt
new file mode 100644
index 0000000..cdc6cee
--- /dev/null
+++ b/LayoutTests/platform/gtk/media/video-no-audio-expected.txt
@@ -0,0 +1,22 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 413x20
+ text run at (0,0) width 413: "Movie with no audio track. The volume button should not render."
+ RenderBlock (anonymous) at (0,36) size 784x288
+ RenderText {#text} at (0,0) size 0x0
+layer at (8,44) size 352x288
+ RenderVideo {VIDEO} at (0,0) size 352x288
+layer at (8,44) size 352x288
+ RenderBlock (relative positioned) {DIV} at (0,0) size 352x288
+layer at (8,312) size 352x20
+ RenderFlexibleBox (positioned) {DIV} at (0,268) size 352x20
+ RenderButton {INPUT} at (0,0) size 20x20
+ RenderFlexibleBox {DIV} at (20,0) size 292x20 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+ RenderSlider {INPUT} at (1,0) size 290x20
+ RenderBlock {DIV} at (2,4) size 12x12
+ RenderButton {INPUT} at (312,0) size 20x20
+ RenderButton {INPUT} at (332,0) size 20x20
diff --git a/LayoutTests/platform/gtk/media/video-transformed-expected.txt b/LayoutTests/platform/gtk/media/video-transformed-expected.txt
new file mode 100644
index 0000000..166e761
--- /dev/null
+++ b/LayoutTests/platform/gtk/media/video-transformed-expected.txt
@@ -0,0 +1,24 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x20
+ RenderText {#text} at (0,0) size 217x20
+ text run at (0,0) width 217: "Test painting of transformed video"
+ RenderBlock (anonymous) at (0,36) size 784x483
+ RenderText {#text} at (0,141) size 4x20
+ text run at (0,141) width 4: " "
+ RenderBR {BR} at (210,156) size 0x0
+ RenderText {#text} at (0,302) size 4x20
+ text run at (0,302) width 4: " "
+ RenderBR {BR} at (210,317) size 0x0
+ RenderText {#text} at (0,463) size 4x20
+ text run at (0,463) width 4: " "
+ RenderBR {BR} at (210,478) size 0x0
+layer at (12,44) size 206x156
+ RenderVideo {VIDEO} at (4,0) size 206x156 [border: (3px solid #FF0000)]
+layer at (12,205) size 206x156
+ RenderVideo {VIDEO} at (4,161) size 206x156 [border: (3px solid #FF0000)]
+layer at (12,366) size 206x156
+ RenderVideo {VIDEO} at (4,322) size 206x156 [border: (3px solid #FF0000)]
diff --git a/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt b/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt
new file mode 100644
index 0000000..8221d55
--- /dev/null
+++ b/LayoutTests/platform/gtk/media/video-zoom-controls-expected.txt
@@ -0,0 +1,34 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (12,12) size 776x543
+ RenderBlock {P} at (0,0) size 776x30
+ RenderText {#text} at (0,0) size 280x30
+ text run at (0,0) width 280: "Zoomed video with controls."
+layer at (57,87) size 240x180
+ RenderVideo {VIDEO} at (45,75) size 240x180
+layer at (57,87) size 240x180
+ RenderBlock (relative positioned) {DIV} at (0,0) size 240x180
+layer at (57,237) size 240x30
+ RenderFlexibleBox (positioned) {DIV} at (0,150) size 240x30
+ RenderButton {INPUT} at (0,0) size 30x30
+ RenderFlexibleBox {DIV} at (30,0) size 120x30 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+ RenderSlider {INPUT} at (1,0) size 118x30
+ RenderBlock {DIV} at (3,9) size 12x12
+ RenderButton {INPUT} at (150,0) size 30x30
+ RenderButton {INPUT} at (180,0) size 30x30
+ RenderButton {INPUT} at (210,0) size 30x30
+layer at (57,312) size 240x180
+ RenderVideo {VIDEO} at (45,300) size 240x180
+layer at (57,312) size 240x180
+ RenderBlock (relative positioned) {DIV} at (0,0) size 240x180
+layer at (57,462) size 240x30
+ RenderFlexibleBox (positioned) {DIV} at (0,150) size 240x30
+ RenderButton {INPUT} at (0,0) size 30x30
+ RenderFlexibleBox {DIV} at (30,0) size 120x30 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
+ RenderSlider {INPUT} at (1,0) size 118x30
+ RenderBlock {DIV} at (3,9) size 12x12
+ RenderButton {INPUT} at (150,0) size 30x30
+ RenderButton {INPUT} at (180,0) size 30x30
+ RenderButton {INPUT} at (210,0) size 30x30
diff --git a/LayoutTests/platform/gtk/media/video-zoom-expected.txt b/LayoutTests/platform/gtk/media/video-zoom-expected.txt
new file mode 100644
index 0000000..0df1db5
--- /dev/null
+++ b/LayoutTests/platform/gtk/media/video-zoom-expected.txt
@@ -0,0 +1,23 @@
+layer at (0,0) size 781x850
+ RenderView at (0,0) size 781x600
+layer at (0,0) size 781x850
+ RenderBlock {HTML} at (0,0) size 781x850
+ RenderBody {BODY} at (8,8) size 765x834
+ RenderBlock {P} at (0,0) size 765x20
+ RenderText {#text} at (0,0) size 283x20
+ text run at (0,0) width 283: "150% zoom, with width and height attributes"
+ RenderBlock (anonymous) at (0,36) size 765x373
+ RenderText {#text} at (0,353) size 4x20
+ text run at (0,353) width 4: " "
+ RenderBR {BR} at (492,368) size 0x0
+ RenderBlock {P} at (0,425) size 765x20
+ RenderText {#text} at (0,0) size 303x20
+ text run at (0,0) width 303: "150% zoom, without width and height attributes"
+ RenderBlock (anonymous) at (0,461) size 765x373
+ RenderText {#text} at (0,353) size 4x20
+ text run at (0,353) width 4: " "
+ RenderBR {BR} at (492,368) size 0x0
+layer at (12,44) size 488x368
+ RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
+layer at (12,469) size 488x368
+ RenderVideo {VIDEO} at (4,0) size 488x368 [border: (4px solid #FF0000)]
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list