Rebaseline LayoutTests/fast/css/css2-system-fonts.html.

Move existing expected results for chromium-win to chromium-win-xp,
and rebaseline on Vista.

The test uses system font names.  It essentially depends on OS versions
and default settings.

BUG=21859
TEST=none
Review URL: http://codereview.chromium.org/329005

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

7 files changed, 62 insertions, 17 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/css/css2-system-fonts-expected.checksum b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/css/css2-system-fonts-expected.checksum
new file mode 100644
index 0000000..3b9dde9
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/css/css2-system-fonts-expected.checksum
@@ -0,0 +1 @@
+147e7d71936c666bb7fdb23c130ec9d0
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/css/css2-system-fonts-expected.png b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/css/css2-system-fonts-expected.png
new file mode 100644
index 0000000..725ec19
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/css/css2-system-fonts-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/css/css2-system-fonts-expected.txt b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/css/css2-system-fonts-expected.txt
new file mode 100644
index 0000000..f78c778
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win-xp/LayoutTests/fast/css/css2-system-fonts-expected.txt
@@ -0,0 +1,45 @@
+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 784x576
+      RenderBlock {H1} at (0,0) size 784x37
+        RenderText {#text} at (0,0) size 265x36
+          text run at (0,0) width 265: "CSS2 System Fonts"
+      RenderBlock {P} at (0,58) size 784x20
+        RenderText {#text} at (0,0) size 365x19
+          text run at (0,0) width 365: "The following should appear with the fonts specified, per the "
+        RenderInline {A} at (0,0) size 75x19 [color=#0000EE]
+          RenderText {#text} at (365,0) size 75x19
+            text run at (365,0) width 75: "CSS2 specs"
+        RenderText {#text} at (440,0) size 332x19
+          text run at (440,0) width 332: ". If they appear in a monospace font, the test has failed."
+      RenderBlock {UL} at (0,94) size 784x96
+        RenderListItem {LI} at (40,0) size 744x19
+          RenderListMarker at (-18,0) size 7x18: bullet
+          RenderText {#text} at (0,0) size 367x18
+            text run at (0,0) width 367: "Caption (on Mac will be Lucida Grande 13.0 Regular)"
+        RenderListItem {LI} at (40,19) size 744x19
+          RenderListMarker at (-18,0) size 7x18: bullet
+          RenderText {#text} at (0,0) size 673x18
+            text run at (0,0) width 673: "Icon (on Mac will be Lucida Grande 13.0 Regular for now, not sure how to get this info from Finder)"
+        RenderListItem {LI} at (40,38) size 744x13
+          RenderListMarker at (-15,0) size 6x13: bullet
+          RenderText {#text} at (0,0) size 239x13
+            text run at (0,0) width 239: "Menu (on Mac will be Lucida Grande 13.0 Regular)"
+        RenderListItem {LI} at (40,51) size 744x19
+          RenderListMarker at (-18,0) size 7x18: bullet
+          RenderText {#text} at (0,0) size 409x18
+            text run at (0,0) width 409: "Message-Box (on Mac will be Lucida Grande 13.0 Regular)"
+        RenderListItem {LI} at (40,70) size 744x13
+          RenderListMarker at (-15,0) size 6x13: bullet
+          RenderText {#text} at (0,0) size 278x13
+            text run at (0,0) width 278: "Small-Caption (on Mac will be Lucida Grande 11.0 Regular)"
+        RenderListItem {LI} at (40,83) size 744x13
+          RenderListMarker at (-15,0) size 6x13: bullet
+          RenderText {#text} at (0,0) size 264x13
+            text run at (0,0) width 264: "Status-Bar (on Mac will be Lucida Grande 10.0 Regular)"
+      RenderBlock {P} at (0,206) size 784x20
+        RenderInline {A} at (0,0) size 173x19 [color=#0000EE]
+          RenderText {#text} at (0,0) size 173x19
+            text run at (0,0) width 173: "\x{AB} Return to Safari Bugs page"
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.checksum
index 3b9dde9..bd92e16 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.checksum
@@ -1 +1 @@
-147e7d71936c666bb7fdb23c130ec9d0
\ No newline at end of file
+fa5cca80ac2e4c90f1d96cb08c0b8b05
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.png
index 725ec19..a358e11 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.txt
index f78c778..da54c81 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/css2-system-fonts-expected.txt
@@ -14,7 +14,7 @@ layer at (0,0) size 800x600
             text run at (365,0) width 75: "CSS2 specs"
         RenderText {#text} at (440,0) size 332x19
           text run at (440,0) width 332: ". If they appear in a monospace font, the test has failed."
-      RenderBlock {UL} at (0,94) size 784x96
+      RenderBlock {UL} at (0,94) size 784x102
         RenderListItem {LI} at (40,0) size 744x19
           RenderListMarker at (-18,0) size 7x18: bullet
           RenderText {#text} at (0,0) size 367x18
@@ -23,23 +23,23 @@ layer at (0,0) size 800x600
           RenderListMarker at (-18,0) size 7x18: bullet
           RenderText {#text} at (0,0) size 673x18
             text run at (0,0) width 673: "Icon (on Mac will be Lucida Grande 13.0 Regular for now, not sure how to get this info from Finder)"
-        RenderListItem {LI} at (40,38) size 744x13
-          RenderListMarker at (-15,0) size 6x13: bullet
-          RenderText {#text} at (0,0) size 239x13
-            text run at (0,0) width 239: "Menu (on Mac will be Lucida Grande 13.0 Regular)"
-        RenderListItem {LI} at (40,51) size 744x19
+        RenderListItem {LI} at (40,38) size 744x15
+          RenderListMarker at (-16,0) size 6x15: bullet
+          RenderText {#text} at (0,0) size 265x15
+            text run at (0,0) width 265: "Menu (on Mac will be Lucida Grande 13.0 Regular)"
+        RenderListItem {LI} at (40,53) size 744x19
           RenderListMarker at (-18,0) size 7x18: bullet
           RenderText {#text} at (0,0) size 409x18
             text run at (0,0) width 409: "Message-Box (on Mac will be Lucida Grande 13.0 Regular)"
-        RenderListItem {LI} at (40,70) size 744x13
-          RenderListMarker at (-15,0) size 6x13: bullet
-          RenderText {#text} at (0,0) size 278x13
-            text run at (0,0) width 278: "Small-Caption (on Mac will be Lucida Grande 11.0 Regular)"
-        RenderListItem {LI} at (40,83) size 744x13
-          RenderListMarker at (-15,0) size 6x13: bullet
-          RenderText {#text} at (0,0) size 264x13
-            text run at (0,0) width 264: "Status-Bar (on Mac will be Lucida Grande 10.0 Regular)"
-      RenderBlock {P} at (0,206) size 784x20
+        RenderListItem {LI} at (40,72) size 744x15
+          RenderListMarker at (-16,0) size 6x15: bullet
+          RenderText {#text} at (0,0) size 310x15
+            text run at (0,0) width 310: "Small-Caption (on Mac will be Lucida Grande 11.0 Regular)"
+        RenderListItem {LI} at (40,87) size 744x15
+          RenderListMarker at (-16,0) size 6x15: bullet
+          RenderText {#text} at (0,0) size 288x15
+            text run at (0,0) width 288: "Status-Bar (on Mac will be Lucida Grande 10.0 Regular)"
+      RenderBlock {P} at (0,212) size 784x20
         RenderInline {A} at (0,0) size 173x19 [color=#0000EE]
           RenderText {#text} at (0,0) size 173x19
             text run at (0,0) width 173: "\x{AB} Return to Safari Bugs page"
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index cfccd5e..9a5271b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3019,7 +3019,6 @@ BUG21841 MAC DEBUG SLOW : LayoutTests/plugins/destroy-during-npp-new.html = FAIL
 BUG21841 WIN DEBUG : LayoutTests/plugins/destroy-during-npp-new.html = CRASH PASS
 
 
-BUG21859 WIN-VISTA : LayoutTests/fast/css/css2-system-fonts.html = FAIL
 BUG21859 WIN-VISTA : LayoutTests/fast/forms/search-styled.html = FAIL
 BUG21859 WIN-VISTA : LayoutTests/fast/text/whitespace/026.html = FAIL
 BUG21859 WIN-VISTA : LayoutTests/fast/text/basic/006.html = FAIL