summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.pngbin0 -> 3033 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.txt12
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/hsla-color-expected.pngbin6615 -> 0 bytes
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt25
5 files changed, 31 insertions, 7 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.checksum
new file mode 100644
index 0000000..bfb05ca
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.checksum
@@ -0,0 +1 @@
+bb3ead585e45e608ca7c95f85b5408a0 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.png
new file mode 100644
index 0000000..2e50d76
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.txt
new file mode 100644
index 0000000..b930970
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/imageTileOpacity-expected.txt
@@ -0,0 +1,12 @@
+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
+layer at (7,75) size 284x212
+ RenderBlock (positioned) {DIV} at (7,75) size 284x212 [bgcolor=#000000D1]
+layer at (104,237) size 37x24
+ RenderBlock (positioned) {DIV} at (97,162) size 37x24 [color=#FFFFFF]
+ RenderBlock {DIV} at (0,0) size 37x24
+ RenderText {#text} at (0,4) size 37x15
+ text run at (0,4) width 37: "Cancel"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/hsla-color-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/hsla-color-expected.png
deleted file mode 100644
index 8ca0d75..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/hsla-color-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 2af8127..fee8223 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1999,19 +1999,30 @@ LayoutTests/svg/custom/stroke-fallback.svg = FAIL
LayoutTests/wml/variable-reference-invalid-character.html = FAIL
LayoutTests/wml/variable-reference-valid.html = FAIL
-// Linux pixeltest failure: Seafoam green showing
+// Linux pixeltest failure: font metrics for Ahem(?).
+// evanm sent a reduction of this problem to agl.
LINUX : LayoutTests/fast/block/margin-collapse/055.html = FAIL
+
// Linux pixeltest failure: We aren't clipping the scrollbar
LINUX : LayoutTests/fast/clip/014.html = FAIL
-// Linux pixeltest failure: Need to check that the alpha channels are correct,
-// otherwise may be ok
-LINUX : LayoutTests/fast/css/hsla-color.html = FAIL
-// Linux pixeltest failure: Looks like we might be drawing this wrong, Windows has a different colour
-LINUX : LayoutTests/fast/css/imageTileOpacity.html = FAIL
+
+// Windows pixeltest failure: alpha=0.5 red does not come out blended.
+// Linux pixeltest failure: alpha=0.5 red (1,0,0) atop yellow (1,1,0) is
+// coming out with with a slightly-less-than-100% red channel.
+// Looks like we need to investigate HSL color conversion.
+LINUX WIN : LayoutTests/fast/css/hsla-color.html = FAIL
+
+// Windows pixeltest failure: upstream baseline has the background of the
+// "Cancel" button in a slightly darker gray than the surrounding dark gray.
+WIN : LayoutTests/fast/css/imageTileOpacity.html = FAIL
+
// Linux pixeltest failure: Word spacing wrong
LINUX : LayoutTests/fast/css/word-space-extra.html = FAIL
-// Linux pixeltest failure: Missing red bars, not clear who is at fault
+
+// Linux pixeltest failure: Appears identical -- needs a pass with a fuzzy
+// differ.
LINUX : LayoutTests/fast/layers/layer-visibility-sublayer.html = FAIL
+
// Linux pixeltest failure: Word spacing
LINUX : LayoutTests/fast/multicol/float-avoidance.html = FAIL
// Linux pixeltest failure: Indent is incorrect