Change the font search order to try Lucida Sans Unicode before Arial Unicode MS because the former is available

on Windows XP or later while the latter is only available with MS Office installed.

This is partly to make font-dependent layout test results 'invariant' with or without Arial Unicode MS installed.
Eventually, we may want to make those tests more robust against the font availability by removing some Unicode 
characters not commonly available.  

BUG=2304
TEST=pass the layout tests affected


Review URL: http://codereview.chromium.org/6495

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

26 files changed, 254 insertions, 253 deletions

diff --git a/base/gfx/font_utils.cc b/base/gfx/font_utils.cc
index d7e119a..23c7f3a 100644
--- a/base/gfx/font_utils.cc
+++ b/base/gfx/font_utils.cc
@@ -259,7 +259,7 @@ const wchar_t* GetFallbackFamily(const wchar_t *characters,
         family = L"simsun-extb";
         break;
       default:
-        family = L"arial unicode ms";
+        family = L"lucida sans unicode";
     }
   }
 
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.txt
index ab22c7e..1f707eb 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.txt
@@ -6,38 +6,38 @@ layer at (0,0) size 800x312
       RenderBlock {P} at (0,0) size 784x40
         RenderText {#text} at (0,0) size 458x19
           text run at (0,0) width 458: "There should be a solid blue line directly over every occurance of the word \""
-        RenderInline {SPAN} at (0,0) size 54x21 [border: (2px solid #0000FF) none]
-          RenderText {#text} at (458,0) size 54x19
-            text run at (458,0) width 54: "HERE \x{21E7}"
-        RenderText {#text} at (512,0) size 757x39
-          text run at (512,0) width 245: "\". (So there should be 8 blue lines on this"
+        RenderInline {SPAN} at (0,0) size 55x21 [border: (2px solid #0000FF) none]
+          RenderText {#text} at (458,0) size 55x19
+            text run at (458,0) width 55: "HERE \x{21E7}"
+        RenderText {#text} at (513,0) size 758x39
+          text run at (513,0) width 245: "\". (So there should be 8 blue lines on this"
           text run at (0,20) width 38: "page.)"
-      RenderTable {TABLE} at (0,56) size 124x82
-        RenderTableSection {TBODY} at (0,0) size 124x82
-          RenderTableRow {TR} at (0,2) size 124x24
-            RenderTableCell {TD} at (2,2) size 120x24 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
-              RenderText {#text} at (33,3) size 54x19
-                text run at (33,3) width 54: "HERE \x{21E7}"
-          RenderTableRow {TR} at (0,28) size 124x52
-            RenderTableCell {TD} at (2,42) size 56x24 [border: (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,3) size 54x19
-                text run at (1,3) width 54: "HERE \x{21E7}"
-            RenderTableCell {TD} at (60,28) size 62x52 [border: (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
-              RenderBlock (anonymous) at (1,3) size 60x20
-                RenderText {#text} at (3,0) size 54x19
-                  text run at (3,0) width 54: "HERE \x{21E7}"
-              RenderTable {TABLE} at (1,23) size 60x28
-                RenderTableSection {TBODY} at (0,0) size 60x28
-                  RenderTableRow {TR} at (0,2) size 60x24
-                    RenderTableCell {TD} at (2,2) size 56x24 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
-                      RenderText {#text} at (1,3) size 54x19
-                        text run at (1,3) width 54: "HERE \x{21E7}"
+      RenderTable {TABLE} at (0,56) size 126x82
+        RenderTableSection {TBODY} at (0,0) size 126x82
+          RenderTableRow {TR} at (0,2) size 126x24
+            RenderTableCell {TD} at (2,2) size 122x24 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
+              RenderText {#text} at (33,3) size 55x19
+                text run at (33,3) width 55: "HERE \x{21E7}"
+          RenderTableRow {TR} at (0,28) size 126x52
+            RenderTableCell {TD} at (2,42) size 57x24 [border: (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,3) size 55x19
+                text run at (1,3) width 55: "HERE \x{21E7}"
+            RenderTableCell {TD} at (61,28) size 63x52 [border: (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
+              RenderBlock (anonymous) at (1,3) size 61x20
+                RenderText {#text} at (3,0) size 55x19
+                  text run at (3,0) width 55: "HERE \x{21E7}"
+              RenderTable {TABLE} at (1,23) size 61x28
+                RenderTableSection {TBODY} at (0,0) size 61x28
+                  RenderTableRow {TR} at (0,2) size 61x24
+                    RenderTableCell {TD} at (2,2) size 57x24 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
+                      RenderText {#text} at (1,3) size 55x19
+                        text run at (1,3) width 55: "HERE \x{21E7}"
       RenderBlock {UL} at (0,154) size 784x126
         RenderListItem {LI} at (40,0) size 744x82 [border: (2px solid #0000FF) none]
           RenderBlock (anonymous) at (0,2) size 744x20
             RenderListMarker at (-18,0) size 7x19: bullet
-            RenderText {#text} at (0,0) size 54x19
-              text run at (0,0) width 54: "HERE \x{21E7}"
+            RenderText {#text} at (0,0) size 55x19
+              text run at (0,0) width 55: "HERE \x{21E7}"
           RenderBlock {UL} at (0,22) size 744x60
             RenderListItem {LI} at (40,0) size 704x20
               RenderListMarker at (-18,0) size 7x19: white bullet
@@ -53,9 +53,9 @@ layer at (0,0) size 800x312
                 text run at (0,0) width 70: "dummy text"
         RenderListItem {LI} at (40,82) size 744x22 [border: (2px solid #0000FF) none]
           RenderListMarker at (-18,2) size 7x19: bullet
-          RenderText {#text} at (0,2) size 54x19
-            text run at (0,2) width 54: "HERE \x{21E7}"
+          RenderText {#text} at (0,2) size 55x19
+            text run at (0,2) width 55: "HERE \x{21E7}"
         RenderListItem {LI} at (40,104) size 744x22 [border: (2px solid #0000FF) none]
           RenderListMarker at (-18,2) size 7x19: bullet
-          RenderText {#text} at (0,2) size 54x19
-            text run at (0,2) width 54: "HERE \x{21E7}"
+          RenderText {#text} at (0,2) size 55x19
+            text run at (0,2) width 55: "HERE \x{21E7}"
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.txt
index 4c0ce22..364dcbe 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.txt
@@ -4,25 +4,26 @@ layer at (0,0) size 800x208
   RenderBlock {HTML} at (0,0) size 800x208
     RenderBody {BODY} at (8,16) size 784x176
       RenderBlock {P} at (0,0) size 764x80 [color=#0000FF] [border: (10px double #0000FF) none]
-        RenderText {#text} at (0,0) size 340x19
-          text run at (0,0) width 340: "This paragraph should have two blue lines on its right. \x{21E8} "
-        RenderInline {SPAN} at (0,0) size 754x79 [color=#C0C0C0]
-          RenderText {#text} at (340,0) size 754x79
-            text run at (340,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
-            text run at (0,20) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (444,20) width 292: "text dummy text dummy text dummy text dummy"
-            text run at (0,40) width 148: "text dummy text dummy "
-            text run at (148,40) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (592,40) width 144: "text dummy text dummy"
-            text run at (0,60) width 296: "text dummy text dummy text dummy text dummy "
-            text run at (296,60) width 318: "text dummy text dummy text dummy text dummy text"
+        RenderText {#text} at (0,0) size 344x19
+          text run at (0,0) width 344: "This paragraph should have two blue lines on its right. \x{21E8} "
+        RenderInline {SPAN} at (0,0) size 736x79 [color=#C0C0C0]
+          RenderText {#text} at (344,0) size 736x79
+            text run at (344,0) width 366: "dummy text dummy text dummy text dummy text dummy text"
+            text run at (0,20) width 48: "dummy "
+            text run at (48,20) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (492,20) width 244: "text dummy text dummy text dummy text"
+            text run at (0,40) width 196: "dummy text dummy text dummy "
+            text run at (196,40) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (640,40) width 96: "text dummy text"
+            text run at (0,60) width 344: "dummy text dummy text dummy text dummy text dummy "
+            text run at (344,60) width 318: "text dummy text dummy text dummy text dummy text"
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,96) size 764x80 [color=#0000FF] [border: (1px solid #0000FF) none]
-        RenderText {#text} at (0,0) size 343x19
-          text run at (0,0) width 343: "This paragraph should have a thin blue line on its right. \x{21E8} "
+        RenderText {#text} at (0,0) size 347x19
+          text run at (0,0) width 347: "This paragraph should have a thin blue line on its right. \x{21E8} "
         RenderInline {SPAN} at (0,0) size 762x79 [color=#C0C0C0]
-          RenderText {#text} at (343,0) size 762x79
-            text run at (343,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
+          RenderText {#text} at (347,0) size 762x79
+            text run at (347,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
             text run at (0,20) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (444,20) width 318: "text dummy text dummy text dummy text dummy text"
             text run at (0,40) width 122: "dummy text dummy "
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.txt
index 9e8b2fb..5d1d0db 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.txt
@@ -6,32 +6,32 @@ layer at (0,0) size 800x312
       RenderBlock {P} at (0,0) size 784x40
         RenderText {#text} at (0,0) size 470x19
           text run at (0,0) width 470: "There should be a solid blue line directly under every occurrence of the word \""
-        RenderInline {SPAN} at (0,0) size 54x21 [border: (2px solid #0000FF) none]
-          RenderText {#text} at (470,0) size 54x19
-            text run at (470,0) width 54: "HERE \x{21E9}"
-        RenderText {#text} at (524,0) size 769x39
-          text run at (524,0) width 245: "\". (So there should be 8 blue lines on this"
+        RenderInline {SPAN} at (0,0) size 55x21 [border: (2px solid #0000FF) none]
+          RenderText {#text} at (470,0) size 55x19
+            text run at (470,0) width 55: "HERE \x{21E9}"
+        RenderText {#text} at (525,0) size 770x39
+          text run at (525,0) width 245: "\". (So there should be 8 blue lines on this"
           text run at (0,20) width 38: "page.)"
-      RenderTable {TABLE} at (0,56) size 124x82
-        RenderTableSection {TBODY} at (0,0) size 124x82
-          RenderTableRow {TR} at (0,2) size 124x24
-            RenderTableCell {TD} at (2,2) size 120x24 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
-              RenderText {#text} at (33,1) size 54x19
-                text run at (33,1) width 54: "HERE \x{21E9}"
-          RenderTableRow {TR} at (0,28) size 124x52
-            RenderTableCell {TD} at (2,42) size 56x24 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (1,1) size 54x19
-                text run at (1,1) width 54: "HERE \x{21E9}"
-            RenderTableCell {TD} at (60,28) size 62x52 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
-              RenderTable {TABLE} at (1,1) size 60x28
-                RenderTableSection {TBODY} at (0,0) size 60x28
-                  RenderTableRow {TR} at (0,2) size 60x24
-                    RenderTableCell {TD} at (2,2) size 56x24 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
-                      RenderText {#text} at (1,1) size 54x19
-                        text run at (1,1) width 54: "HERE \x{21E9}"
-              RenderBlock (anonymous) at (1,29) size 60x20
-                RenderText {#text} at (3,0) size 54x19
-                  text run at (3,0) width 54: "HERE \x{21E9}"
+      RenderTable {TABLE} at (0,56) size 126x82
+        RenderTableSection {TBODY} at (0,0) size 126x82
+          RenderTableRow {TR} at (0,2) size 126x24
+            RenderTableCell {TD} at (2,2) size 122x24 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
+              RenderText {#text} at (33,1) size 55x19
+                text run at (33,1) width 55: "HERE \x{21E9}"
+          RenderTableRow {TR} at (0,28) size 126x52
+            RenderTableCell {TD} at (2,42) size 57x24 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 55x19
+                text run at (1,1) width 55: "HERE \x{21E9}"
+            RenderTableCell {TD} at (61,28) size 63x52 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
+              RenderTable {TABLE} at (1,1) size 61x28
+                RenderTableSection {TBODY} at (0,0) size 61x28
+                  RenderTableRow {TR} at (0,2) size 61x24
+                    RenderTableCell {TD} at (2,2) size 57x24 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
+                      RenderText {#text} at (1,1) size 55x19
+                        text run at (1,1) width 55: "HERE \x{21E9}"
+              RenderBlock (anonymous) at (1,29) size 61x20
+                RenderText {#text} at (3,0) size 55x19
+                  text run at (3,0) width 55: "HERE \x{21E9}"
       RenderBlock {UL} at (0,154) size 784x126
         RenderListItem {LI} at (40,0) size 744x82 [border: (2px solid #0000FF) none]
           RenderBlock {UL} at (0,0) size 744x60
@@ -49,13 +49,13 @@ layer at (0,0) size 800x312
               RenderText {#text} at (0,0) size 70x19
                 text run at (0,0) width 70: "dummy text"
           RenderBlock (anonymous) at (0,60) size 744x20
-            RenderText {#text} at (0,0) size 54x19
-              text run at (0,0) width 54: "HERE \x{21E9}"
+            RenderText {#text} at (0,0) size 55x19
+              text run at (0,0) width 55: "HERE \x{21E9}"
         RenderListItem {LI} at (40,82) size 744x22 [border: (2px solid #0000FF) none]
           RenderListMarker at (-18,0) size 7x19: bullet
-          RenderText {#text} at (0,0) size 54x19
-            text run at (0,0) width 54: "HERE \x{21E9}"
+          RenderText {#text} at (0,0) size 55x19
+            text run at (0,0) width 55: "HERE \x{21E9}"
         RenderListItem {LI} at (40,104) size 744x22 [border: (2px solid #0000FF) none]
           RenderListMarker at (-18,0) size 7x19: bullet
-          RenderText {#text} at (0,0) size 54x19
-            text run at (0,0) width 54: "HERE \x{21E9}"
+          RenderText {#text} at (0,0) size 55x19
+            text run at (0,0) width 55: "HERE \x{21E9}"
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.txt
index 2b53230c..803afc6 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.txt
@@ -4,11 +4,11 @@ layer at (0,0) size 800x208
   RenderBlock {HTML} at (0,0) size 800x208
     RenderBody {BODY} at (8,16) size 784x176
       RenderBlock {P} at (20,0) size 764x80 [color=#0000FF] [border: (10px double #0000FF)]
-        RenderText {#text} at (10,0) size 332x19
-          text run at (10,0) width 332: "\x{21E6} This paragraph should have two blue lines on its left. "
-        RenderInline {SPAN} at (0,0) size 746x79 [color=#C0C0C0]
-          RenderText {#text} at (342,0) size 746x79
-            text run at (342,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
+        RenderText {#text} at (10,0) size 336x19
+          text run at (10,0) width 336: "\x{21E6} This paragraph should have two blue lines on its left. "
+        RenderInline {SPAN} at (0,0) size 750x79 [color=#C0C0C0]
+          RenderText {#text} at (346,0) size 750x79
+            text run at (346,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
             text run at (10,20) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (454,20) width 292: "text dummy text dummy text dummy text dummy"
             text run at (10,40) width 148: "text dummy text dummy "
@@ -18,11 +18,11 @@ layer at (0,0) size 800x208
             text run at (306,60) width 318: "text dummy text dummy text dummy text dummy text"
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (20,96) size 764x80 [color=#0000FF] [border: (1px solid #0000FF)]
-        RenderText {#text} at (1,0) size 335x19
-          text run at (1,0) width 335: "\x{21E6} This paragraph should have a thin blue line on its left. "
+        RenderText {#text} at (1,0) size 339x19
+          text run at (1,0) width 339: "\x{21E6} This paragraph should have a thin blue line on its left. "
         RenderInline {SPAN} at (0,0) size 762x79 [color=#C0C0C0]
-          RenderText {#text} at (336,0) size 762x79
-            text run at (336,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
+          RenderText {#text} at (340,0) size 762x79
+            text run at (340,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
             text run at (1,20) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (445,20) width 318: "text dummy text dummy text dummy text dummy text"
             text run at (1,40) width 122: "dummy text dummy "
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt
index 3e2d59d..259b89d 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt
@@ -14,13 +14,13 @@ layer at (0,0) size 800x328
           text run at (100,20) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text "
           text run at (544,20) width 218: "dummy text dummy text dummy text"
           text run at (0,40) width 222: "dummy text dummy text dummy text "
-        RenderInline {SPAN} at (0,0) size 759x39 [color=#0000FF] [border: (10px double #0000FF)]
-          RenderText {#text} at (232,40) size 161x19
-            text run at (232,40) width 161: "\x{21E6} two blue lines to the left "
-          RenderInline {SPAN} at (0,0) size 759x39 [color=#C0C0C0]
-            RenderText {#text} at (393,40) size 759x39
-              text run at (393,40) width 48: "dummy "
-              text run at (441,40) width 318: "text dummy text dummy text dummy text dummy text"
+        RenderInline {SPAN} at (0,0) size 763x39 [color=#0000FF] [border: (10px double #0000FF)]
+          RenderText {#text} at (232,40) size 165x19
+            text run at (232,40) width 165: "\x{21E6} two blue lines to the left "
+          RenderInline {SPAN} at (0,0) size 763x39 [color=#C0C0C0]
+            RenderText {#text} at (397,40) size 763x39
+              text run at (397,40) width 48: "dummy "
+              text run at (445,40) width 318: "text dummy text dummy text dummy text dummy text"
               text run at (0,60) width 122: "dummy text dummy "
               text run at (122,60) width 392: "text dummy text dummy text dummy text dummy text dummy text"
           RenderText {#text} at (514,60) size 4x19
@@ -36,12 +36,12 @@ layer at (0,0) size 800x328
           text run at (0,120) width 322: "text dummy text dummy text dummy text dummy text "
           text run at (322,120) width 440: "dummy text dummy text dummy text dummy text dummy text dummy text"
           text run at (0,140) width 370: "dummy text dummy text dummy text dummy text dummy text "
-        RenderInline {SPAN} at (0,0) size 180x19 [color=#0000FF] [border: (1px solid #0000FF)]
-          RenderText {#text} at (371,140) size 179x19
-            text run at (371,140) width 179: "\x{21E6} one thin blue line to the left "
-        RenderText {#text} at (550,140) size 784x99
-          text run at (550,140) width 48: "dummy "
-          text run at (598,140) width 170: "text dummy text dummy text"
+        RenderInline {SPAN} at (0,0) size 184x19 [color=#0000FF] [border: (1px solid #0000FF)]
+          RenderText {#text} at (371,140) size 183x19
+            text run at (371,140) width 183: "\x{21E6} one thin blue line to the left "
+        RenderText {#text} at (554,140) size 784x99
+          text run at (554,140) width 48: "dummy "
+          text run at (602,140) width 170: "text dummy text dummy text"
           text run at (0,160) width 270: "dummy text dummy text dummy text dummy "
           text run at (270,160) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy "
           text run at (714,160) width 70: "text dummy"
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.txt
index 58f5356..79c235d 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.txt
@@ -11,32 +11,32 @@ layer at (0,0) size 800x278
           text run at (338,20) width 65: "alignment.)"
       RenderBlock {DIV} at (16,56) size 320x0
         RenderBlock (floating) {P} at (4,4) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 1"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 1"
         RenderBlock (floating) {P} at (138,4) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 37x19
-            text run at (7,7) width 37: "\x{21E6} B 2"
+          RenderText {#text} at (7,7) size 41x19
+            text run at (7,7) width 41: "\x{21E6} B 2"
         RenderBlock (floating) {P} at (4,46) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 3"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 3"
         RenderBlock (floating) {P} at (190,46) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (82,7) size 37x19
-            text run at (82,7) width 37: "B 4 \x{21E8}"
+          RenderText {#text} at (78,7) size 41x19
+            text run at (78,7) width 41: "B 4 \x{21E8}"
         RenderBlock (floating) {P} at (4,88) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 5"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 5"
         RenderBlock (floating) {P} at (190,88) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (82,7) size 37x19
-            text run at (82,7) width 37: "B 6 \x{21E8}"
+          RenderText {#text} at (78,7) size 41x19
+            text run at (78,7) width 41: "B 6 \x{21E8}"
         RenderBlock (floating) {P} at (190,130) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (82,7) size 37x19
-            text run at (82,7) width 37: "B 8 \x{21E8}"
+          RenderText {#text} at (78,7) size 41x19
+            text run at (78,7) width 41: "B 8 \x{21E8}"
         RenderBlock (floating) {P} at (4,130) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 7"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 7"
         RenderBlock (floating) {P} at (4,172) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 9"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 9"
         RenderBlock (floating) {P} at (138,172) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 45x19
-            text run at (7,7) width 45: "\x{21E6} B 10"
+          RenderText {#text} at (7,7) size 49x19
+            text run at (7,7) width 49: "\x{21E6} B 10"
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.txt
index bf011eb0..3690827 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.txt
@@ -11,32 +11,32 @@ layer at (0,0) size 800x278
           text run at (381,20) width 112: "correct alignment.)"
       RenderBlock {DIV} at (16,56) size 320x0
         RenderBlock (floating) {P} at (190,4) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (82,7) size 37x19
-            text run at (82,7) width 37: "B 2 \x{21E8}"
+          RenderText {#text} at (78,7) size 41x19
+            text run at (78,7) width 41: "B 2 \x{21E8}"
         RenderBlock (floating) {P} at (56,4) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (81,7) size 38x19
-            text run at (81,7) width 38: "A 1 \x{21E8}"
+          RenderText {#text} at (77,7) size 42x19
+            text run at (77,7) width 42: "A 1 \x{21E8}"
         RenderBlock (floating) {P} at (190,46) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (82,7) size 37x19
-            text run at (82,7) width 37: "B 4 \x{21E8}"
+          RenderText {#text} at (78,7) size 41x19
+            text run at (78,7) width 41: "B 4 \x{21E8}"
         RenderBlock (floating) {P} at (4,46) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 3"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 3"
         RenderBlock (floating) {P} at (190,88) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (82,7) size 37x19
-            text run at (82,7) width 37: "B 6 \x{21E8}"
+          RenderText {#text} at (78,7) size 41x19
+            text run at (78,7) width 41: "B 6 \x{21E8}"
         RenderBlock (floating) {P} at (4,88) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 5"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 5"
         RenderBlock (floating) {P} at (4,130) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 7"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 7"
         RenderBlock (floating) {P} at (190,130) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (82,7) size 37x19
-            text run at (82,7) width 37: "B 8 \x{21E8}"
+          RenderText {#text} at (78,7) size 41x19
+            text run at (78,7) width 41: "B 8 \x{21E8}"
         RenderBlock (floating) {P} at (190,172) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (74,7) size 45x19
-            text run at (74,7) width 45: "B 10 \x{21E8}"
+          RenderText {#text} at (70,7) size 49x19
+            text run at (70,7) width 49: "B 10 \x{21E8}"
         RenderBlock (floating) {P} at (56,172) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (81,7) size 38x19
-            text run at (81,7) width 38: "A 9 \x{21E8}"
+          RenderText {#text} at (77,7) size 42x19
+            text run at (77,7) width 42: "A 9 \x{21E8}"
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.txt
index bde9962..f53adbd 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.txt
@@ -11,44 +11,44 @@ layer at (0,0) size 800x362
           text run at (338,20) width 65: "alignment.)"
       RenderBlock {DIV} at (16,56) size 320x0
         RenderBlock (floating) {P} at (4,4) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 1"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 1"
         RenderBlock (floating) {P} at (138,4) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 37x19
-            text run at (7,7) width 37: "\x{21E6} B 2"
+          RenderText {#text} at (7,7) size 41x19
+            text run at (7,7) width 41: "\x{21E6} B 2"
         RenderBlock (floating) {P} at (4,46) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 3"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 3"
         RenderBlock (floating) {P} at (190,46) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (82,7) size 37x19
-            text run at (82,7) width 37: "B 4 \x{21E8}"
+          RenderText {#text} at (78,7) size 41x19
+            text run at (78,7) width 41: "B 4 \x{21E8}"
         RenderBlock (floating) {P} at (4,88) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 5"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 5"
         RenderBlock (floating) {P} at (190,88) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (82,7) size 37x19
-            text run at (82,7) width 37: "B 6 \x{21E8}"
+          RenderText {#text} at (78,7) size 41x19
+            text run at (78,7) width 41: "B 6 \x{21E8}"
         RenderBlock (floating) {P} at (4,130) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 7"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 7"
         RenderBlock (floating) {P} at (138,130) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 37x19
-            text run at (7,7) width 37: "\x{21E6} B 8"
+          RenderText {#text} at (7,7) size 41x19
+            text run at (7,7) width 41: "\x{21E6} B 8"
         RenderBlock (floating) {P} at (4,172) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 38x19
-            text run at (7,7) width 38: "\x{21E6} A 9"
+          RenderText {#text} at (7,7) size 42x19
+            text run at (7,7) width 42: "\x{21E6} A 9"
         RenderBlock (floating) {P} at (190,172) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (74,7) size 45x19
-            text run at (74,7) width 45: "B 10 \x{21E8}"
+          RenderText {#text} at (70,7) size 49x19
+            text run at (70,7) width 49: "B 10 \x{21E8}"
         RenderBlock (floating) {P} at (4,214) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 46x19
-            text run at (7,7) width 46: "\x{21E6} A 11"
+          RenderText {#text} at (7,7) size 50x19
+            text run at (7,7) width 50: "\x{21E6} A 11"
         RenderBlock (floating) {P} at (190,214) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (74,7) size 45x19
-            text run at (74,7) width 45: "B 12 \x{21E8}"
+          RenderText {#text} at (70,7) size 49x19
+            text run at (70,7) width 49: "B 12 \x{21E8}"
         RenderBlock (floating) {P} at (4,256) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 46x19
-            text run at (7,7) width 46: "\x{21E6} A 13"
+          RenderText {#text} at (7,7) size 50x19
+            text run at (7,7) width 50: "\x{21E6} A 13"
         RenderBlock (floating) {P} at (138,256) size 126x34 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {#text} at (7,7) size 45x19
-            text run at (7,7) width 45: "\x{21E6} B 14"
+          RenderText {#text} at (7,7) size 49x19
+            text run at (7,7) width 49: "\x{21E6} B 14"
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.txt
index 37d58b9..9e61650 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.txt
@@ -11,5 +11,5 @@ layer at (0,0) size 800x135
               text run at (0,20) width 76: "and spill out "
               text run at (76,20) width 164: "onto the blue area below it."
         RenderBlock {P} at (3,3) size 778x20
-          RenderText {#text} at (0,0) size 243x19
-            text run at (0,0) width 243: "You should see a teal box to the right. \x{21E8}"
+          RenderText {#text} at (0,0) size 247x19
+            text run at (0,0) width 247: "You should see a teal box to the right. \x{21E8}"
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
index 2b3eda3..ff693b3 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
@@ -12,14 +12,14 @@ layer at (0,0) size 800x288
               text run at (96,20) width 198: "tightly squeezed in between the"
               text run at (0,40) width 177: "edge of the teal box and the "
               text run at (177,40) width 117: "outside edge of the"
-              text run at (0,60) width 82: "blue block. \x{21E8}"
+              text run at (0,60) width 86: "blue block. \x{21E8}"
         RenderBlock {P} at (0,0) size 588x280
           RenderText {#text} at (0,0) size 277x39
             text run at (0,0) width 277: "Inside this blue block on the right there should"
-            text run at (0,20) width 118: "be a teal box. \x{21E8} "
+            text run at (0,20) width 120: "be a teal box. \x{21E8} "
           RenderInline {SPAN} at (0,0) size 588x259 [color=#000080]
-            RenderText {#text} at (118,20) size 588x259
-              text run at (118,20) width 159: "FAIL FAIL FAIL FAIL"
+            RenderText {#text} at (120,20) size 588x259
+              text run at (120,20) width 157: "FAIL FAIL FAIL FAIL"
               text run at (0,40) width 277: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
               text run at (0,60) width 40: "FAIL "
               text run at (40,60) width 237: "FAIL FAIL FAIL FAIL FAIL FAIL"
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt
index 145c968..85f5932 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt
@@ -4,8 +4,8 @@ layer at (0,0) size 785x776
   RenderBlock {HTML} at (0,0) size 785x776
     RenderBody {BODY} at (8,32) size 769x712
       RenderBlock {P} at (32,0) size 705x111 [color=#000080]
-        RenderText {#text} at (0,0) size 654x110
-          text run at (0,0) width 654: "\x{21E9} The following blue box should be exactly half the"
+        RenderText {#text} at (0,0) size 656x110
+          text run at (0,0) width 656: "\x{21E9} The following blue box should be exactly half the"
           text run at (0,37) width 80: "width "
           text run at (80,37) width 551: "of the viewport, on the left of the 50% ruler"
           text run at (0,74) width 72: "mark."
@@ -99,6 +99,6 @@ layer at (0,0) size 785x776
           text run at (0,480) width 258: "dummy text this is some dummy text this is "
           text run at (258,480) width 253: "some dummy text this is some dummy text"
       RenderBlock {P} at (32,675) size 705x37 [color=#000080]
-        RenderText {#text} at (3,0) size 702x36
-          text run at (3,0) width 679: "The above gray text should flow around the blue box. "
-          text run at (682,0) width 23: "\x{21E7}"
+        RenderText {#text} at (1,0) size 704x36
+          text run at (1,0) width 679: "The above gray text should flow around the blue box. "
+          text run at (680,0) width 25: "\x{21E7}"
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt
index 06be029..8afaf99 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt
@@ -7,6 +7,6 @@ layer at (0,0) size 800x54
         RenderBlock (floating) {P} at (0,0) size 392x46
           RenderText {#text} at (0,0) size 340x45
             text run at (0,0) width 340: "There should be a green square to the right,"
-            text run at (0,23) width 295: "roughly in the middle, horizontally. \x{21E8}"
+            text run at (0,23) width 300: "roughly in the middle, horizontally. \x{21E8}"
         RenderImage {IMG} at (392,0) size 15x15 [color=#FF0000]
         RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
index e97267e..bb031e29 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
@@ -7,9 +7,9 @@ layer at (0,0) size 800x48
         RenderBlock {DIV} at (0,0) size 784x20
           RenderBlock (floating) {P} at (392,0) size 392x40
             RenderImage {IMG} at (0,0) size 15x15 [color=#FF0000]
-            RenderText {#text} at (15,0) size 344x39
+            RenderText {#text} at (15,0) size 348x39
               text run at (15,0) width 4: " "
-              text run at (19,0) width 325: "\x{21E6} There should be a green square at the top left of the"
+              text run at (19,0) width 329: "\x{21E6} There should be a green square at the top left of the"
               text run at (0,20) width 52: "window."
           RenderImage {IMG} at (0,0) size 15x15 [color=#FF0000]
           RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.txt
index 9cd50dd..b8883a2 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.txt
@@ -6,7 +6,7 @@ layer at (0,0) size 800x301
       RenderBlock (floating) {DIV} at (0,0) size 196x285 [color=#FFFFFF] [bgcolor=#000080]
         RenderBlock {P} at (0,0) size 196x285
           RenderText {#text} at (0,1) size 182x283
-            text run at (0,1) width 129: "\x{21E6} This"
+            text run at (0,1) width 140: "\x{21E6} This"
             text run at (0,58) width 164: "blue box"
             text run at (0,115) width 182: "should be"
             text run at (0,172) width 115: "on the"
@@ -18,11 +18,11 @@ layer at (0,0) size 800x301
             text run at (0,58) width 71: "box"
             text run at (0,115) width 182: "should be"
             text run at (0,172) width 115: "on the"
-            text run at (0,229) width 146: "right. \x{21E8}"
+            text run at (0,229) width 157: "right. \x{21E8}"
       RenderBlock {P} at (0,0) size 784x285
-        RenderText {#text} at (196,1) size 385x283
+        RenderText {#text} at (196,1) size 390x283
           text run at (196,1) width 360: "This text should be"
           text run at (196,58) width 331: "in between a blue"
-          text run at (196,115) width 385: "box on the \x{21E6}left and"
-          text run at (196,172) width 310: "a teal box on the"
-          text run at (196,229) width 134: "right\x{21E8}."
+          text run at (196,115) width 316: "box on the \x{21E6}left"
+          text run at (196,172) width 390: "and a teal box on the"
+          text run at (196,229) width 145: "right\x{21E8}."
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.txt
index cd579d7..b1b8350 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.txt
@@ -9,12 +9,12 @@ layer at (0,0) size 800x144
       RenderBlock {DIV} at (0,36) size 784x76
         RenderBlock {DIV} at (16,0) size 752x76 [color=#00FFFF] [bgcolor=#008080]
           RenderBlock (floating) {P} at (8,8) size 176x56 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)]
-            RenderText {#text} at (8,8) size 150x39
-              text run at (8,8) width 150: "\x{21E6} This blue block should"
+            RenderText {#text} at (8,8) size 154x39
+              text run at (8,8) width 154: "\x{21E6} This blue block should"
               text run at (8,28) width 82: "be on the left."
           RenderBlock (floating) {P} at (568,8) size 176x56 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)]
-            RenderText {#text} at (8,8) size 150x39
-              text run at (8,8) width 150: "\x{21E8} This blue block should"
+            RenderText {#text} at (8,8) size 154x39
+              text run at (8,8) width 154: "\x{21E8} This blue block should"
               text run at (8,28) width 90: "be on the right."
           RenderText {#text} at (184,8) size 364x59
             text run at (184,8) width 364: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle."
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.txt
index efb015b..7043819 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.txt
@@ -4,16 +4,16 @@ layer at (0,0) size 800x220
   RenderBlock {HTML} at (0,0) size 800x144
     RenderBody {BODY} at (8,16) size 784x112
       RenderBlock {P} at (0,0) size 784x20 [color=#000080]
-        RenderText {#text} at (0,0) size 374x19
+        RenderText {#text} at (0,0) size 378x19
           text run at (0,0) width 233: "In the following test, the purple square "
-          text run at (233,0) width 141: "should be on the left (\x{21E6}"
-        RenderImage {IMG} at (374,0) size 19x19
-        RenderText {#text} at (393,0) size 206x19
-          text run at (393,0) width 206: "), and the teal square on the right ("
-        RenderImage {IMG} at (599,0) size 19x19
-        RenderText {#text} at (618,0) size 145x19
-          text run at (618,0) width 87: "\x{21E8}) of the blue "
-          text run at (705,0) width 58: "rectangle."
+          text run at (233,0) width 145: "should be on the left (\x{21E6}"
+        RenderImage {IMG} at (378,0) size 19x19
+        RenderText {#text} at (397,0) size 206x19
+          text run at (397,0) width 206: "), and the teal square on the right ("
+        RenderImage {IMG} at (603,0) size 19x19
+        RenderText {#text} at (622,0) size 149x19
+          text run at (622,0) width 91: "\x{21E8}) of the blue "
+          text run at (713,0) width 58: "rectangle."
       RenderBlock {DIV} at (0,36) size 784x76
         RenderBlock {DIV} at (16,0) size 752x76 [color=#0000FF] [bgcolor=#000080]
           RenderImage {IMG} at (8,8) size 160x160
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
index a20e705..79ce1dd 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
@@ -14,23 +14,23 @@ layer at (0,0) size 800x470
       RenderBlock {DIV} at (16,76) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)]
         RenderText {#text} at (133,21) size 444x19
           text run at (133,21) width 444: "dummy text dummy text dummy text dummy text dummy text dummy text "
-        RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
-          RenderText {#text} at (580,21) size 11x19
-            text run at (580,21) width 11: "\x{21E6}"
-        RenderText {#text} at (594,21) size 4x19
-          text run at (594,21) width 4: " "
+        RenderInline {SPAN} at (0,0) size 21x25 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
+          RenderText {#text} at (580,21) size 15x19
+            text run at (580,21) width 15: "\x{21E6}"
+        RenderText {#text} at (598,21) size 4x19
+          text run at (598,21) width 4: " "
         RenderImage {IMG} at (21,21) size 112x112 [color=#FF0000]
-        RenderText {#text} at (598,21) size 583x39
-          text run at (598,21) width 118: "dummy text dummy"
+        RenderText {#text} at (602,21) size 587x39
+          text run at (602,21) width 118: "dummy text dummy"
           text run at (133,41) width 322: "text dummy text dummy text dummy text dummy text "
-        RenderInline {SPAN} at (0,0) size 17x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
-          RenderText {#text} at (458,41) size 11x19
-            text run at (458,41) width 11: "\x{21E8}"
-        RenderText {#text} at (472,41) size 4x19
-          text run at (472,41) width 4: " "
+        RenderInline {SPAN} at (0,0) size 21x25 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
+          RenderText {#text} at (458,41) size 15x19
+            text run at (458,41) width 15: "\x{21E8}"
+        RenderText {#text} at (476,41) size 4x19
+          text run at (476,41) width 4: " "
         RenderImage {IMG} at (619,41) size 112x112 [color=#FF0000]
-        RenderText {#text} at (476,41) size 710x299
-          text run at (476,41) width 118: "dummy text dummy"
+        RenderText {#text} at (480,41) size 710x299
+          text run at (480,41) width 118: "dummy text dummy"
           text run at (133,61) width 322: "text dummy text dummy text dummy text dummy text "
           text run at (455,61) width 144: "dummy text dummy text"
           text run at (133,81) width 296: "dummy text dummy text dummy text dummy text "
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt
index 6aee8a1..a739d2f 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt
@@ -5,11 +5,11 @@ layer at (0,0) size 800x292
     RenderBody {BODY} at (8,16) size 784x260
       RenderBlock {P} at (0,0) size 784x260 [color=#000080]
         RenderImage {IMG} at (0,0) size 50x50
-        RenderText {#text} at (50,0) size 305x19
-          text run at (50,0) width 305: "\x{21E6} This text should flow around the box on the left. "
+        RenderText {#text} at (50,0) size 309x19
+          text run at (50,0) width 309: "\x{21E6} This text should flow around the box on the left. "
         RenderInline {SPAN} at (0,0) size 784x259 [color=#C0C0C0]
-          RenderText {#text} at (355,0) size 784x259
-            text run at (355,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
+          RenderText {#text} at (359,0) size 784x259
+            text run at (359,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
             text run at (50,20) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (494,20) width 244: "text dummy text dummy text dummy text"
             text run at (50,40) width 196: "dummy text dummy text dummy "
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt
index 141ab77..7ab4cf6 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt
@@ -5,11 +5,11 @@ layer at (0,0) size 800x292
     RenderBody {BODY} at (8,16) size 784x260
       RenderBlock {P} at (0,0) size 784x260 [color=#000080]
         RenderImage {IMG} at (734,0) size 50x50
-        RenderText {#text} at (0,0) size 313x19
-          text run at (0,0) width 313: "This text should flow around the box on the right. \x{21E8} "
+        RenderText {#text} at (0,0) size 317x19
+          text run at (0,0) width 317: "This text should flow around the box on the right. \x{21E8} "
         RenderInline {SPAN} at (0,0) size 784x259 [color=#C0C0C0]
-          RenderText {#text} at (313,0) size 784x259
-            text run at (313,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
+          RenderText {#text} at (317,0) size 784x259
+            text run at (317,0) width 414: "dummy text dummy text dummy text dummy text dummy text dummy"
             text run at (0,20) width 444: "text dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (444,20) width 244: "text dummy text dummy text dummy text"
             text run at (0,40) width 196: "dummy text dummy text dummy "
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
index c222b9a..2ee5f9d 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
@@ -4,9 +4,9 @@ layer at (0,0) size 800x460
   RenderBlock {HTML} at (0,0) size 800x460
     RenderBody {BODY} at (8,16) size 784x428
       RenderBlock {P} at (0,0) size 784x20 [color=#000080]
-        RenderText {#text} at (0,0) size 752x19
+        RenderText {#text} at (0,0) size 756x19
           text run at (0,0) width 377: "Below this paragraph there should be a big teal square half the "
           text run at (377,0) width 350: "width of the window, aligned flush with the right hand side "
-          text run at (727,0) width 25: "(\x{21E8})."
+          text run at (727,0) width 29: "(\x{21E8})."
       RenderBlock {P} at (0,36) size 784x392 [color=#000080]
         RenderImage {IMG} at (392,0) size 392x392
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.txt
index c7c3c3e..0c1db50 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.txt
@@ -9,6 +9,6 @@ layer at (0,0) size 800x127
           RenderImage {IMG} at (15,0) size 15x15
           RenderText {#text} at (30,0) size 4x19
             text run at (30,0) width 4: " "
-          RenderInline {SPAN} at (0,0) size 341x19 [color=#000000]
-            RenderText {#text} at (34,0) size 341x19
-              text run at (34,0) width 341: "\x{21E6} There should be a green square to the left, and no red."
+          RenderInline {SPAN} at (0,0) size 345x19 [color=#000000]
+            RenderText {#text} at (34,0) size 345x19
+              text run at (34,0) width 345: "\x{21E6} There should be a green square to the left, and no red."
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum
index 4e71f00..75ac150 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.checksum
@@ -1 +1 @@
-b86812047c552df589b61db1ae549c10
\ No newline at end of file
+e18eeb1d791687cb90718e08eb5df24a
\ No newline at end of file
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png
index 8421c75..f9b66c5 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.png
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.txt
index 3f1687f..e9313058 100644
--- a/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.txt
+++ b/webkit/data/layout_test_results/v8/LayoutTests/css2.1/t1503-c522-font-family-00-b-expected.txt
@@ -1,9 +1,9 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x287
-  RenderBlock {HTML} at (0,0) size 800x287
-    RenderBody {BODY} at (8,8) size 784x271
-      RenderBlock {DIV} at (0,0) size 784x120
+layer at (0,0) size 800x283
+  RenderBlock {HTML} at (0,0) size 800x283
+    RenderBody {BODY} at (8,8) size 784x267
+      RenderBlock {DIV} at (0,0) size 784x118
         RenderBlock {P} at (0,0) size 784x20 [color=#000080]
           RenderText {#text} at (0,0) size 228x19
             text run at (0,0) width 228: "This sentence should be in a serif font."
@@ -13,22 +13,22 @@ layer at (0,0) size 800x287
         RenderBlock {P} at (0,40) size 784x19 [color=#000080]
           RenderText {#text} at (0,0) size 301x18
             text run at (0,0) width 301: "This sentence should be in a sans-serif font."
-        RenderBlock {P} at (0,59) size 784x20 [color=#000080]
-          RenderText {#text} at (0,0) size 245x19
-            text run at (0,0) width 245: "This sentence should be in a cursive font."
-        RenderBlock {P} at (0,79) size 784x25 [color=#000080]
-          RenderText {#text} at (0,0) size 280x25
-            text run at (0,0) width 280: "This sentence should be in a fantasy font."
-        RenderBlock {P} at (0,104) size 784x16 [color=#000080]
+        RenderBlock {P} at (0,59) size 784x23 [color=#000080]
+          RenderText {#text} at (0,0) size 299x23
+            text run at (0,0) width 299: "This sentence should be in a cursive font."
+        RenderBlock {P} at (0,82) size 784x20 [color=#000080]
+          RenderText {#text} at (0,0) size 267x20
+            text run at (0,0) width 267: "This sentence should be in a fantasy font."
+        RenderBlock {P} at (0,102) size 784x16 [color=#000080]
           RenderText {#text} at (0,0) size 352x16
             text run at (0,0) width 352: "This sentence should be in a monospace font."
-      RenderBlock {P} at (0,120) size 784x19 [color=#000080]
+      RenderBlock {P} at (0,118) size 784x19 [color=#000080]
         RenderText {#text} at (0,0) size 301x18
           text run at (0,0) width 301: "This sentence should be in a sans-serif font."
-      RenderBlock {P} at (0,139) size 784x16 [color=#000080]
+      RenderBlock {P} at (0,137) size 784x16 [color=#000080]
         RenderText {#text} at (0,0) size 352x16
           text run at (0,0) width 352: "This sentence should be in a monospace font."
-      RenderBlock {DIV} at (0,155) size 784x116
+      RenderBlock {DIV} at (0,153) size 784x114
         RenderBlock {P} at (0,0) size 784x16 [color=#000080]
           RenderText {#text} at (0,0) size 352x16
             text run at (0,0) width 352: "This sentence should be in a monospace font."
@@ -38,12 +38,12 @@ layer at (0,0) size 800x287
         RenderBlock {P} at (0,36) size 784x19 [color=#000080]
           RenderText {#text} at (0,0) size 301x18
             text run at (0,0) width 301: "This sentence should be in a sans-serif font."
-        RenderBlock {P} at (0,55) size 784x20 [color=#000080]
-          RenderText {#text} at (0,0) size 245x19
-            text run at (0,0) width 245: "This sentence should be in a cursive font."
-        RenderBlock {P} at (0,75) size 784x25 [color=#000080]
-          RenderText {#text} at (0,0) size 280x25
-            text run at (0,0) width 280: "This sentence should be in a fantasy font."
-        RenderBlock {P} at (0,100) size 784x16 [color=#000080]
+        RenderBlock {P} at (0,55) size 784x23 [color=#000080]
+          RenderText {#text} at (0,0) size 299x23
+            text run at (0,0) width 299: "This sentence should be in a cursive font."
+        RenderBlock {P} at (0,78) size 784x20 [color=#000080]
+          RenderText {#text} at (0,0) size 267x20
+            text run at (0,0) width 267: "This sentence should be in a fantasy font."
+        RenderBlock {P} at (0,98) size 784x16 [color=#000080]
           RenderText {#text} at (0,0) size 352x16
             text run at (0,0) width 352: "This sentence should be in a monospace font."
diff --git a/webkit/port/platform/graphics/FontCacheWin.cpp b/webkit/port/platform/graphics/FontCacheWin.cpp
index beda286..0156ccb 100644
--- a/webkit/port/platform/graphics/FontCacheWin.cpp
+++ b/webkit/port/platform/graphics/FontCacheWin.cpp
@@ -396,10 +396,10 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font,
     const static wchar_t* const commonFonts[] = {
         L"tahoma",
         L"arial unicode ms",
-        L"microsoft sans serif",
         L"lucida sans unicode",
+        L"microsoft sans serif",
         L"palatino linotype",
-        // Four fonts below (code2000 at the end) are not from MS, but
+        // Four fonts below (and code2000 at the end) are not from MS, but
         // once installed, cover a very wide range of characters.
         L"freeserif",
         L"freesans",