Windows baseline updates

Add a test which WebKit currently can't handle to the tests_ignored.txt.

Delete a bogus Windows baseline which is clearly wrong and mark it as
failing on Windows. Add baseline for that test on Linux.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6638 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 10 insertions, 4 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum
new file mode 100644
index 0000000..d5d3c09
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum
@@ -0,0 +1 @@
+b884f12964cdb3adc23c5fe7c340d79b
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png
new file mode 100644
index 0000000..f14d829
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt
index cdad61e..5bfc828 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt
@@ -28,8 +28,8 @@ layer at (0,0) size 800x300
         RenderText {#text} at (24,0) size 24x24
           text run at (24,0) width 24: "x"
       RenderBlock {DIV} at (0,204) size 432x24 [color=#0000FF]
-        RenderText {#text} at (30,0) size 24x24
-          text run at (30,0) width 24: "x"
+        RenderText {#text} at (24,0) size 24x24
+          text run at (24,0) width 24: "x"
       RenderBlock {DIV} at (0,228) size 432x24 [color=#0000FF]
         RenderText {#text} at (24,0) size 24x24
           text run at (24,0) width 24: "x"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum
deleted file mode 100644
index 90f5b86..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d5682de794e9f47d37be8808cce86405
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png
deleted file mode 100644
index 3160bde..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png
+++ /dev/null
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index ccf64db..d42df4e 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -814,6 +814,9 @@ LINUX MAC : LayoutTests/fast/forms/button-sizes.html = FAIL
 // Form sizing issue.
 LINUX MAC : LayoutTests/fast/forms/disabled-select-change-index.html = FAIL
 
+// This needs to be rebased on Windows since the baseline was incorrect.
+WIN : LayoutTests/css2.1/t1601-c547-indent-00-b-a.html = FAIL
+
 // Uncharacterized tests that fail on linux but pass on windows.
 // TODO(port): figure out what's wrong with these and annotate appropriately.
 LINUX : LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag.html = FAIL
@@ -823,7 +826,6 @@ LINUX : LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag.html = FAIL
 WIN : LayoutTests/css2.1/t1507-c526-font-sz-02-b-a.html = FAIL
 LINUX : LayoutTests/css2.1/t1508-c527-font-00-b.html = FAIL
 LINUX : LayoutTests/css2.1/t1508-c527-font-09-b.html = FAIL
-LINUX : LayoutTests/css2.1/t1601-c547-indent-00-b-a.html = FAIL
 LINUX : LayoutTests/css2.1/t1604-c541-word-sp-00-b-a.html = FAIL
 LINUX : LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a.html = FAIL
 LINUX : LayoutTests/editing/deleting/5144139-2.html = FAIL
diff --git a/webkit/tools/layout_tests/test_lists/tests_ignored.txt b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
index 9695f5e..5176c15 100644
--- a/webkit/tools/layout_tests/test_lists/tests_ignored.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
@@ -194,3 +194,7 @@ LINUX : chrome/fonts/impact.html = FAIL
 // repeatedly creates big regular expressions.  All the test is trying
 // to verify is that we don't crash on this page.
 LayoutTests/fast/js/regexp-charclass-crash.html = PASS TIMEOUT
+
+// This tests that CSS counters are renumbered when an element is deleted.
+// WebKit doesn't handle this yet.
+LayoutTests/css2.1/t1204-increment-01-c-o.html = FAIL