summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.pngbin15070 -> 11674 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.pngbin43795 -> 42556 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.pngbin43095 -> 41854 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.pngbin113110 -> 110928 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.pngbin44381 -> 43144 bytes
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt14
11 files changed, 15 insertions, 9 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.checksum
index 2beb5a8..6bb099f 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.checksum
@@ -1 +1 @@
-976d572a6fdf3025770348923fc8e261 \ No newline at end of file
+9b74bec98d4370d8c99ebb0225b8dd8b \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.png
index 7568556..e3e7e64 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/audio-controls-rendering-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.checksum
index 1e73c01..7281aeb 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.checksum
@@ -1 +1 @@
-e9f01f11cda73a895d37129b66946a7f \ No newline at end of file
+61b3a57d46c816f68c854afba92a3b28 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.png
index 5aa52aa..0967522 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-after-reload-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.checksum
index 63dfebb..d550ec8 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.checksum
@@ -1 +1 @@
-8decb4825a00025eb8b40191b57eee19 \ No newline at end of file
+74786294fa010f52548c2d6abafbd926 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.png
index 3d1c749..0497b36 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/controls-strict-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.checksum
index 4650d0ee..016e865 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.checksum
@@ -1 +1 @@
-95d567924eb3ce0f63cd52b631cbd42f \ No newline at end of file
+966c05f2b4828c25e745f37598ecc1a8 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.png
index 79b0f9f..d8ecbf3 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-controls-rendering-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.checksum
index 7a79544..147bdc1 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.checksum
@@ -1 +1 @@
-4f2ee9971a10bfbbc9d0df01d94166a1 \ No newline at end of file
+fba4aa5f898a5c83cddc26e0668a60b2 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.png
index 82aaca6..ca8a50b 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/media/video-display-toggle-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 0b44d57..3e62e01 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -87,7 +87,6 @@ BUG24182 WIN LINUX DEBUG : LayoutTests/fast/backgrounds/size/contain-and-cover.h
BUG24182 MAC SLOW : LayoutTests/dom/html/level2/html/HTMLImageElement01.html = PASS
BUG24182 SLOW WIN DEBUG : LayoutTests/svg/carto.net/scrollbar.svg = PASS
// BUG24182 DEBUG SLOW WIN MAC : LayoutTests/media/audio-controls-rendering.html = PASS
-BUG24182 DEBUG SLOW MAC : LayoutTests/media/audio-controls-rendering.html = PASS
BUG24182 SLOW DEBUG : LayoutTests/storage/domstorage/localstorage/index-get-and-set.html = PASS
BUG24182 SLOW WONTFIX DEBUG : LayoutTests/platform/mac-snowleopard/accessibility/aria-list-and-listitem.html = FAIL
BUG24182 SLOW WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = PASS
@@ -789,7 +788,6 @@ BUG13907 WIN LINUX DEBUG SLOW : LayoutTests/media/video-canvas-source.html = FAI
BUG9798 BUG13907 SKIP : LayoutTests/media/video-controls.html = TIMEOUT PASS
BUG13907 : LayoutTests/media/video-controls-transformed.html = FAIL
BUG9798 BUG13907 SKIP: LayoutTests/media/video-currentTime-set.html = FAIL TIMEOUT
-BUG9798 BUG13907 SKIP LINUX DEBUG: LayoutTests/media/video-currentTime-set2.html = FAIL TIMEOUT
BUG9798 BUG13907 WIN RELEASE : LayoutTests/media/video-error-abort.html = FAIL PASS
BUG9798 BUG13907 : LayoutTests/media/video-layer-crash.html = FAIL PASS
BUG9798 BUG13907 WIN LINUX DEBUG : LayoutTests/media/video-load-networkState.html = TIMEOUT PASS
@@ -814,6 +812,13 @@ BUG13907 MAC : LayoutTests/media/video-zoom-controls.html = FAIL
// Image mismatch on mac only. This test appears to be flaky.
BUG13907 MAC : LayoutTests/media/video-transformed.html = FAIL PASS
+// These are timing out only on Linux debug. We have no idea why.
+BUG13907 SKIP LINUX DEBUG : LayoutTests/media/controls-strict.html = TIMEOUT
+BUG13907 SKIP LINUX DEBUG : LayoutTests/media/video-currentTime.html = TIMEOUT
+BUG13907 SKIP LINUX DEBUG : LayoutTests/media/video-currentTime-set2.html = TIMEOUT
+BUG13907 SKIP LINUX DEBUG : LayoutTests/media/video-display-none-crash.html = TIMEOUT
+BUG13907 SKIP LINUX DEBUG : LayoutTests/media/video-dom-src.html = TIMEOUT
+
// These tests are WONTFIX because they uess codecs chromium doesn't support.
BUG16779 WONTFIX SKIP : LayoutTests/media/video-can-play-type.html = FAIL TIMEOUT
BUG16779 WONTFIX SKIP : LayoutTests/media/video-document-types.html = FAIL TIMEOUT
@@ -3211,7 +3216,6 @@ BUG_JEREMY LINUX WIN : LayoutTests/http/tests/navigation/reload-subframe-object.
// When fixing , uncomment line in BUG24182 to mark this test as slow for WIN!
BUG_JEREMY LINUX WIN : LayoutTests/media/audio-controls-rendering.html = FAIL
BUG_JEREMY LINUX WIN : LayoutTests/media/controls-after-reload.html = FAIL
-BUG_JEREMY LINUX WIN : LayoutTests/media/controls-strict.html = FAIL
// When fixing, uncomment line above to mark this test as slow.
BUG_JEREMY LINUX WIN : LayoutTests/media/video-controls-rendering.html = FAIL
// When fixing, uncomment line above to mark this test as slow.
@@ -3228,4 +3232,6 @@ BUG_JEREMY LINUX WIN : LayoutTests/svg/custom/svg-fonts-in-html.html = FAIL
BUG_JEREMY WIN : LayoutTests/editing/deleting/deletionUI-single-instance.html = FAIL
BUG_JEREMY WIN : chrome/fast/forms/basic-selects.html = FAIL
BUG_JEREMY MAC : LayoutTests/fast/frames/onlyCommentInIFrame.html = CRASH FAIL
-BUG_JEREMY MAC : LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f.svg = FAIL \ No newline at end of file
+BUG_JEREMY MAC : LayoutTests/svg/W3C-SVG-1.1/filters-diffuse-01-f.svg = FAIL
+BUG_JEREMY WIN : LayoutTests/fast/clip/overflow-border-radius-clip.html = FAIL
+BUG_JEREMY WIN : LayoutTests/fast/css/shadow-multiple.html = FAIL