summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/001-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/001-expected.pngbin1847 -> 1813 bytes
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt3
3 files changed, 3 insertions, 2 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/001-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/001-expected.checksum
index dd62864..fbe4450 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/001-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/001-expected.checksum
@@ -1 +1 @@
-6528d7a9623174eb717810ef344a2444 \ No newline at end of file
+1568d632b94efeb5dee07dd34832713a \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/001-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/001-expected.png
index a261f18..76d23a0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/001-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/positioning/001-expected.png
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 830d5426..4032579 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1561,7 +1561,8 @@ LINUX : LayoutTests/fast/clip/010.html = PASS CRASH
LINUX : LayoutTests/fast/clip/012.html = PASS CRASH
// Regressions from WebKit merge to 40864
-WIN LINUX : LayoutTests/fast/block/positioning/001.html = FAIL PASS
+// Likely just needs a rebaseline.
+LINUX : LayoutTests/fast/block/positioning/001.html = FAIL PASS
// New test. We should fix it, but it doesn't need to block the current release
DEFER : LayoutTests/fast/dom/getClientRects.html = FAIL
WIN : LayoutTests/fast/forms/searchfield-heights.html = FAIL