summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.pngbin0 -> 3434 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.txt11
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-multiple-remote-sources-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-multiple-remote-sources-expected.pngbin3284 -> 0 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-remote-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-remote-expected.pngbin3543 -> 0 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.pngbin5005 -> 0 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.txt26
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/font-face-cascade-order-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/font-face-cascade-order-expected.pngbin5494 -> 0 bytes
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt7
13 files changed, 15 insertions, 34 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.checksum
new file mode 100644
index 0000000..620206b9
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.checksum
@@ -0,0 +1 @@
+d6081a55e64796f3bfe52e3681e4a9a2 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.png
new file mode 100644
index 0000000..63de456
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.txt
new file mode 100644
index 0000000..3632956
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/font-face-cascade-order-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderSVGRoot {svg} at (10,5) size 957x113
+ RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+ RenderSVGText {text} at (10,75) size 957x88 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,-70) size 957x88
+ chunk 1 text run 1 at (10.00,75.59) startOffset 0 endOffset 11 width 957.00: "ONLY BLOCKS"
+ RenderSVGText {text} at (30,113) size 282x20 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,-15) size 282x20
+ chunk 1 text run 1 at (30.00,113.39) startOffset 0 endOffset 43 width 282.00: "The text above should only show Ahem blocks"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-multiple-remote-sources-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-multiple-remote-sources-expected.checksum
deleted file mode 100644
index 788f89b..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-multiple-remote-sources-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-a08785fb0cad660791a791912a99caf6 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-multiple-remote-sources-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-multiple-remote-sources-expected.png
deleted file mode 100644
index bd509c3..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-multiple-remote-sources-expected.png
+++ /dev/null
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-remote-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-remote-expected.checksum
deleted file mode 100644
index 8249944..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-remote-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-da2434602f4379e95156486a3dc57673 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-remote-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-remote-expected.png
deleted file mode 100644
index 136cf72..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/font-face-remote-expected.png
+++ /dev/null
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.checksum
deleted file mode 100644
index abd2ad9..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-f3e04247b6e8ec669eaef59e985c055f \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.png
deleted file mode 100644
index a661321..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.png
+++ /dev/null
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.txt
deleted file mode 100644
index c7307a0..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/overflow-outline-repaint-expected.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-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 (anonymous) at (0,0) size 784x40
- RenderText {#text} at (0,0) size 751x39
- text run at (0,0) width 557: "If the red outline at the bottom of the div extends all the way to the scrollbar, the test passes. "
- text run at (557,0) width 194: "If it stops short, then the test has"
- text run at (0,20) width 280: "failed, and an incomplete repaint has occurred."
-layer at (8,48) size 80x69 clip at (8,48) size 65x69 scrollY 91 scrollHeight 219
- RenderBlock {DIV} at (0,40) size 80x69
- RenderBR {BR} at (0,0) size 0x19
- RenderBR {BR} at (0,20) size 0x19
- RenderBR {BR} at (0,40) size 0x19
- RenderBR {BR} at (0,60) size 0x19
- RenderBR {BR} at (0,80) size 0x19
- RenderBR {BR} at (0,100) size 0x19
- RenderBR {BR} at (0,120) size 0x19
- RenderBR {BR} at (0,140) size 0x19
- RenderBR {BR} at (0,160) size 0x19
- RenderInline {SPAN} at (0,0) size 59x39
- RenderText {#text} at (0,180) size 59x39
- text run at (0,180) width 59: "Excellent!"
- text run at (0,200) width 26: "Test"
- RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/font-face-cascade-order-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/font-face-cascade-order-expected.checksum
deleted file mode 100644
index 5a1fb5e..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/font-face-cascade-order-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-04bf1f9365f450f6b0490f52148f7eb3 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/font-face-cascade-order-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/font-face-cascade-order-expected.png
deleted file mode 100644
index 5684a72..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/font-face-cascade-order-expected.png
+++ /dev/null
Binary files differ
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index c1c410b..f69e807 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -326,10 +326,9 @@ LINUX WIN : LayoutTests/editing/pasteboard/drag-drop-dead-frame.html = FAIL
// to fork to add support for @font-face for Beta.
// upstream: http://trac.webkit.org/projects/webkit/changeset/31507
-// Linux pixeltest failure: Check if Windows baseline is wrong
-LINUX WIN : LayoutTests/fast/css/font-face-multiple-remote-sources.html = FAIL
+WIN : LayoutTests/fast/css/font-face-multiple-remote-sources.html = FAIL
LINUX WIN : LayoutTests/fast/css/font-face-remote.html = FAIL
-LINUX WIN : LayoutTests/svg/custom/font-face-cascade-order.svg = FAIL
+WIN : LayoutTests/svg/custom/font-face-cascade-order.svg = FAIL
// Bug: 1007391
// These hit a not-implemented code-path in @font-face code
@@ -1203,7 +1202,7 @@ LayoutTests/fast/overflow/overflow-x-y.html = FAIL
LINUX WIN : LayoutTests/fast/overflow/unreachable-overflow-rtl-bug.html = FAIL
LayoutTests/fast/parser/comment-in-textarea.html = FAIL
LayoutTests/fast/parser/open-comment-in-textarea.html = FAIL
-// Linux pixeltest failure: Appears that Windows baseline is wrong
+// Linux pixeltest failure: We, with Windows, are failing to repaint correctly
LINUX WIN : LayoutTests/fast/repaint/overflow-outline-repaint.html = FAIL
LINUX WIN : LayoutTests/fast/repaint/overflow-scroll-delete.html = FAIL
LayoutTests/fast/replaced/width100percent-textarea.html = FAIL