Merge virtual mac-antialiasedtext and windows-directwrite test suites

LayoutTests/platform/win-xp/virtual/windows-directwrite/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt

Index: LayoutTests/platform/win-xp/virtual/windows-directwrite/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt
diff --git a/LayoutTests/platform/win-xp/virtual/windows-directwrite/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt b/LayoutTests/platform/win-xp/virtual/windows-directwrite/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt
deleted file mode 100644
index ae3349431812d21593490d658b12b0d0bfbd18c7..0000000000000000000000000000000000000000
--- a/LayoutTests/platform/win-xp/virtual/windows-directwrite/fast/text/chromium-linux-fontconfig-renderstyle-expected.txt
+++ /dev/null
@@ -1,122 +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 784x576
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 210x19
-          text run at (0,0) width 210: "This test requires Chromium Linux "
-        RenderInline {TT} at (0,0) size 80x16
-          RenderText {#text} at (210,3) size 80x16
-            text run at (210,3) width 80: "test_shell"
-        RenderText {#text} at (290,0) size 18x19
-          text run at (290,0) width 18: " in "
-        RenderInline {TT} at (0,0) size 104x16
-          RenderText {#text} at (308,3) size 104x16
-            text run at (308,3) width 104: "--layout-test"
-        RenderText {#text} at (412,0) size 750x39
-          text run at (412,0) width 306: " mode, as that forces some rendering settings used "
-          text run at (718,0) width 32: "in the"
-          text run at (0,20) width 89: "following tests."
-      RenderBlock {OL} at (0,56) size 784x476
-        RenderListItem {LI} at (40,0) size 744x56
-          RenderBlock {P} at (0,0) size 744x20
-            RenderListMarker at (-21,0) size 16x19: "1"
-            RenderText {#text} at (0,0) size 318x19
-              text run at (0,0) width 318: "The following text should render without anti-aliasing:"
-          RenderBlock {P} at (0,36) size 744x20
-            RenderText {#text} at (0,0) size 133x19
-              text run at (0,0) width 133: "Non anti-aliased sans."
-        RenderListItem {LI} at (40,72) size 744x76
-          RenderBlock {P} at (0,0) size 744x40
-            RenderListMarker at (-21,0) size 16x19: "2"
-            RenderText {#text} at (0,0) size 665x39
-              text run at (0,0) width 315: "The following text should be slightly-hinted Georgia. "
-              text run at (315,0) width 57: "The dots "
-              text run at (372,0) width 293: "should be equally spaced, and letters in the word"
-              text run at (0,20) width 84: "\"government\" "
-              text run at (84,20) width 392: "should be naturally spaced (without an ugly space before the \"e\")."
-          RenderBlock {P} at (0,56) size 744x20
-            RenderText {#text} at (0,0) size 202x19
-              text run at (0,0) width 202: "government ................................"
-        RenderListItem {LI} at (40,164) size 744x76
-          RenderBlock {P} at (0,0) size 744x40
-            RenderListMarker at (-21,0) size 16x19: "3"
-            RenderText {#text} at (0,0) size 738x39
-              text run at (0,0) width 377: "The following text should be unhinted Verdana. The fontconfig "
-              text run at (377,0) width 361: "configuration for this is contradictory, setting both full-hinting"
-              text run at (0,20) width 245: "and no-hinting. The latter should win out."
-          RenderBlock {P} at (0,56) size 744x20
-            RenderText {#text} at (0,0) size 471x19
-              text run at (0,0) width 331: "Here is Tigger doing what tiggers do best \x{2026} operating "
-              text run at (331,0) width 140: "hydraulic exoskeletons."
-        RenderListItem {LI} at (40,256) size 744x56
-          RenderBlock {P} at (0,0) size 744x20
-            RenderListMarker at (-21,0) size 16x19: "4"
-            RenderText {#text} at (0,0) size 595x19
-              text run at (0,0) width 374: "The following text should show a difference caused by forcing "
-              text run at (374,0) width 221: "autohinting. Note: the effect is subtle."
-          RenderBlock {P} at (0,36) size 744x20
-            RenderInline {SPAN} at (0,0) size 42x12
-              RenderText {#text} at (0,5) size 42x12
-                text run at (0,5) width 42: "autohinted"
-            RenderText {#text} at (42,0) size 4x19
-              text run at (42,0) width 4: " "
-            RenderInline {I} at (0,0) size 14x19
-              RenderText {#text} at (46,0) size 14x19
-                text run at (46,0) width 14: "vs"
-            RenderText {#text} at (60,0) size 4x19
-              text run at (60,0) width 4: " "
-            RenderInline {SPAN} at (0,0) size 58x12
-              RenderText {#text} at (64,5) size 58x12
-                text run at (64,5) width 58: "not-autohinted"
-        RenderListItem {LI} at (40,328) size 744x76
-          RenderBlock {P} at (0,0) size 744x40
-            RenderListMarker at (-21,0) size 16x19: "5"
-            RenderText {#text} at (0,0) size 512x19
-              text run at (0,0) width 512: "The following text should be the same. It verifies that, given the contradictory settings "
-            RenderInline {TT} at (0,0) size 64x16
-              RenderText {#text} at (512,3) size 64x16
-                text run at (512,3) width 64: "hintfull"
-            RenderText {#text} at (576,0) size 30x19
-              text run at (576,0) width 30: " and "
-            RenderInline {TT} at (0,0) size 64x16
-              RenderText {#text} at (606,3) size 64x16
-                text run at (606,3) width 64: "autohint"
-            RenderText {#text} at (670,0) size 730x39
-              text run at (670,0) width 60: ", the latter"
-              text run at (0,20) width 53: "wins out:"
-          RenderBlock {P} at (0,56) size 744x20
-            RenderInline {SPAN} at (0,0) size 42x12
-              RenderText {#text} at (0,5) size 42x12
-                text run at (0,5) width 42: "autohinted"
-            RenderText {#text} at (42,0) size 4x19
-              text run at (42,0) width 4: " "
-            RenderInline {I} at (0,0) size 14x19
-              RenderText {#text} at (46,0) size 14x19
-                text run at (46,0) width 14: "vs"
-            RenderText {#text} at (60,0) size 4x19
-              text run at (60,0) width 4: " "
-            RenderInline {SPAN} at (0,0) size 82x12
-              RenderText {#text} at (64,5) size 82x12
-                text run at (64,5) width 82: "hopefully autohinted"
-        RenderListItem {LI} at (40,420) size 744x56
-          RenderBlock {P} at (0,0) size 744x20
-            RenderListMarker at (-21,0) size 16x19: "6"
-            RenderText {#text} at (0,0) size 590x19
-              text run at (0,0) width 414: "The following text should show that fontconfig can be used to enable "
-              text run at (414,0) width 176: "or disable subpixel rendering."
-          RenderBlock {P} at (0,36) size 744x20
-            RenderInline {SPAN} at (0,0) size 49x19
-              RenderText {#text} at (0,0) size 49x19
-                text run at (0,0) width 49: "subpixel"
-            RenderText {#text} at (49,0) size 4x19
-              text run at (49,0) width 4: " "
-            RenderInline {I} at (0,0) size 14x19
-              RenderText {#text} at (53,0) size 14x19
-                text run at (53,0) width 14: "vs"
-            RenderText {#text} at (67,0) size 4x19
-              text run at (67,0) width 4: " "
-            RenderInline {SPAN} at (0,0) size 68x19
-              RenderText {#text} at (71,0) size 68x19
-                text run at (71,0) width 68: "no subpixel"