summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 23:52:41 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 23:52:41 +0000
commit077f407134feb70cbee7cecc8ab7f1cdf68d7c34 (patch)
treeb3d40ca24557ae26ec333d6975b04aa559efb848
parent8244fafba0c441b0a76cd4679f23ade2c7c8e208 (diff)
downloadchromium_src-077f407134feb70cbee7cecc8ab7f1cdf68d7c34.zip
chromium_src-077f407134feb70cbee7cecc8ab7f1cdf68d7c34.tar.gz
chromium_src-077f407134feb70cbee7cecc8ab7f1cdf68d7c34.tar.bz2
Rebaseline video-volume-slider.html
TEST=video-volume-slider.html BUG=None Review URL: http://codereview.chromium.org/372038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31328 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-volume-slider-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-volume-slider-expected.pngbin0 -> 40879 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.pngbin36339 -> 50475 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.txt45
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.pngbin36339 -> 36449 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.txt3
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
9 files changed, 28 insertions, 31 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-volume-slider-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-volume-slider-expected.checksum
new file mode 100644
index 0000000..676deb2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-volume-slider-expected.checksum
@@ -0,0 +1 @@
+761ef04ead48af686e93d5747fd363c8 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-volume-slider-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-volume-slider-expected.png
new file mode 100644
index 0000000..fc47a1b
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/media/video-volume-slider-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.checksum
index a39a82e..3b634eb 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.checksum
@@ -1 +1 @@
-b8a1a475e08b1ffd858455320c4303d2 \ No newline at end of file
+a2b96dad6fc30c8115ebbf54db75dd4d \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.png
index a7aa374..8f70fdb 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.txt
index d22df88..a929b99 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-volume-slider-expected.txt
@@ -3,38 +3,39 @@ layer 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 413x19
- text run at (0,0) width 413: "Tests if the volume slider is rendererd properly. This test assumes the"
- RenderBR {BR} at (413,15) size 0x0
- RenderText {#text} at (0,20) size 423x19
- text run at (0,20) width 423: "volume slider is implmented and mouse over the right bottom corner of"
- RenderBR {BR} at (423,35) size 0x0
- RenderText {#text} at (0,40) size 252x19
- text run at (0,40) width 252: "video element will show the volume slider."
- RenderBR {BR} at (252,55) size 0x0
+ RenderText {#text} at (0,0) size 433x18
+ text run at (0,0) width 433: "Tests if the volume slider is rendererd properly. This test assumes the"
+ RenderBR {BR} at (433,14) size 0x0
+ RenderText {#text} at (0,18) size 446x18
+ text run at (0,18) width 446: "volume slider is implmented and mouse over the right bottom corner of"
+ RenderBR {BR} at (446,32) size 0x0
+ RenderText {#text} at (0,36) size 270x18
+ text run at (0,36) width 270: "video element will show the volume slider."
+ RenderBR {BR} at (270,50) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
-layer at (8,68) size 320x240
- RenderVideo {VIDEO} at (0,60) size 320x240
-layer at (8,68) size 320x240
+layer at (8,62) size 320x240
+ RenderVideo {VIDEO} at (0,54) size 320x240
+layer at (8,62) size 320x240
RenderBlock (relative positioned) {DIV} at (0,0) size 320x240
-layer at (8,276) size 320x32
+layer at (8,270) size 320x32
RenderFlexibleBox (positioned) {DIV} at (0,208) size 320x32 [bgcolor=#00000099]
-layer at (15,282) size 18x19
+layer at (15,276) size 18x19
RenderButton {INPUT} at (7,6) size 18x19
-layer at (38,276) size 256x32
+layer at (38,270) size 256x32
RenderFlexibleBox (positioned) {DIV} at (30,0) size 256x32 [border: (1px solid #FFFFFF33) none (1px solid #FFFFFF33)]
-layer at (235,282) size 58x20
+layer at (235,276) size 58x20
RenderBlock (positioned) {DIV} at (197,6) size 58x20 [color=#FFFFFF]
- RenderText {#text} at (8,1) size 42x19
- text run at (8,1) width 42: "00:00"
-layer at (45,283) size 183x24
+ RenderText {#text} at (8,2) size 41x17
+ text run at (8,2) width 41: "00:00"
+layer at (45,277) size 183x24
RenderSlider {INPUT} at (7,7) size 183x18 [color=#328CDF] [bgcolor=#FFFFFF14] [border: (1px solid #FFFFFF33)]
RenderBlock {DIV} at (3,-5) size 9x29
-layer at (294,276) size 34x32
+layer at (294,270) size 34x32
RenderButton {INPUT} at (286,0) size 34x32
-layer at (294,176) size 34x100
+layer at (294,170) size 34x100
RenderBlock (positioned) {DIV} at (286,-100) size 34x100
-layer at (306,186) size 10x80
+layer at (306,180) size 12x80
RenderSlider {INPUT} at (12,10) size 10x80
+ RenderBlock {DIV} at (-2,22) size 14x7
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.checksum
index a39a82e..40424fc 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.checksum
@@ -1 +1 @@
-b8a1a475e08b1ffd858455320c4303d2 \ No newline at end of file
+7e290b906c34398e0c99ffe953034a7f \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.png
index a7aa374..5e867ef 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.txt
index d22df88..d8b44d9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/media/video-volume-slider-expected.txt
@@ -36,5 +36,6 @@ layer at (294,276) size 34x32
RenderButton {INPUT} at (286,0) size 34x32
layer at (294,176) size 34x100
RenderBlock (positioned) {DIV} at (286,-100) size 34x100
-layer at (306,186) size 10x80
+layer at (306,186) size 12x80
RenderSlider {INPUT} at (12,10) size 10x80
+ RenderBlock {DIV} at (-2,22) size 14x7
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 7dc9113..66468ed 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3018,12 +3018,6 @@ BUG26107 WIN LINUX : LayoutTests/http/tests/security/cross-frame-access-call.htm
BUG26344 LINUX DEBUG : LayoutTests/fast/text/atsui-partial-selection.html = CRASH
BUG26344 LINUX DEBUG : LayoutTests/platform/mac/editing/deleting/backward-delete.html = CRASH
-// WebKit roll 49992:49997
-// hclam to add expected results.
-// Update: failing in an odd way since the WebKit 50417:50432 roll; does
-// not seem to be finding fallback results; skipping for now.
-WIN LINUX MAC BUG_HCLAM : LayoutTests/media/video-volume-slider.html = FAIL CRASH
-
// WebKit roll 50073:50101
// Test added by Ryosuke: http://trac.webkit.org/changeset/50090
BUG25889 MAC DEBUG : LayoutTests/fast/forms/select-empty-option-height.html = PASS TIMEOUT