summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.pngbin15394 -> 44064 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.pngbin15371 -> 15614 bytes
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
5 files changed, 2 insertions, 6 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum
index cd89740..7d03eb7 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum
@@ -1 +1 @@
-f567a0097b98dc80f2607b5b2e13aa3f \ No newline at end of file
+eeea5e3ef74d27360888032f9635cf78 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.png
index 51b44c0..f05c00b0 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/svg-fonts-in-html-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum
index 22a6de0..5ab440b 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.checksum
@@ -1 +1 @@
-9782dd1616cad9ea8c1ac0bc454ba2d3 \ No newline at end of file
+9f9ad7c1996a433bdebffd7dccdc5b3d \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.png
index 4d7e13a..5865d87 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/svg-fonts-in-html-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index ed2c9ca..49a78ca 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -926,7 +926,6 @@ BUG10304 LINUX : LayoutTests/svg/carto.net/slider.svg = FAIL
BUG10304 LINUX : LayoutTests/svg/carto.net/textbox.svg = FAIL
BUG10304 LINUX : LayoutTests/svg/carto.net/window.svg = FAIL
BUG10304 LINUX : LayoutTests/svg/custom/coords-relative-units-transforms.svg = FAIL
-BUG10304 LINUX : LayoutTests/svg/custom/svg-fonts-in-html.html = FAIL
BUG10304 LINUX : LayoutTests/svg/custom/use-referencing-nonexisting-symbol.svg = FAIL
BUG10304 LINUX : LayoutTests/svg/hixie/perf/003.xml = FAIL
BUG10304 LINUX : LayoutTests/svg/hixie/perf/004.xml = FAIL
@@ -2716,9 +2715,6 @@ BUG17883 WIN LINUX : LayoutTests/editing/deleting/pruning-after-merge-2.html = F
BUG17883 WIN LINUX : LayoutTests/editing/execCommand/5138441.html = FAIL
BUG17883 WIN LINUX : LayoutTests/editing/pasteboard/display-block-on-spans.html = FAIL
-// Test failures from WebKit merge 46508 to 46531
-BUG17974 WIN : LayoutTests/svg/custom/svg-fonts-in-html.html = FAIL
-
// This happened when I enabled DOM Storage. Adam asked me to just exclude and
// file a bug.
BUG18412 : LayoutTests/http/tests/security/isolatedWorld/all-window-properties.html = FAIL