Re-baseline additional tests after the big font-metric hack-excision.

BUG=1221100
TEST=covered by layout tests

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

15 files changed, 347 insertions, 197 deletions

diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/css/rtl-ordering-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/css/rtl-ordering-expected.txt
index f27ac2c..e31d532 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/fast/css/rtl-ordering-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/css/rtl-ordering-expected.txt
@@ -3,45 +3,45 @@ layer 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 784x32
-        RenderText {#text} at (0,0) size 212x16
-          text run at (0,0) width 212 LTR override: "This tests for a regression against "
-        RenderInline {I} at (0,0) size 712x32
-          RenderInline {A} at (0,0) size 344x16 [color=#0000EE]
-            RenderText {#text} at (212,0) size 344x16
-              text run at (212,0) width 344 LTR override: "http://bugzilla.opendarwin.org/show_bug.cgi?id=6334"
-          RenderText {#text} at (556,0) size 712x32
-            text run at (556,0) width 156 LTR override: " REGRESSION: <input"
-            text run at (0,16) width 368 LTR override: "type=\"button\"> text is reversed on \"visual Hebrew\" pages"
-        RenderText {#text} at (368,16) size 4x16
-          text run at (368,16) width 4 LTR override: "."
-      RenderBlock {HR} at (0,48) size 784x2 [border: (1px inset #000000)]
-      RenderBlock {P} at (0,66) size 784x16
-        RenderText {#text} at (0,0) size 300x16
-          text run at (0,0) width 263 LTR override: "The text on both buttons should like this: "
-          text run at (263,0) width 37 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
-      RenderBlock (anonymous) at (0,98) size 784x40
-        RenderButton {BUTTON} at (0,0) size 46x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 202x19
+          text run at (0,0) width 202 LTR override: "This tests for a regression against "
+        RenderInline {I} at (0,0) size 702x39
+          RenderInline {A} at (0,0) size 350x19 [color=#0000EE]
+            RenderText {#text} at (202,0) size 350x19
+              text run at (202,0) width 350 LTR override: "http://bugzilla.opendarwin.org/show_bug.cgi?id=6334"
+          RenderText {#text} at (552,0) size 702x39
+            text run at (552,0) width 150 LTR override: " REGRESSION: <input"
+            text run at (0,20) width 382 LTR override: "type=\"button\"> text is reversed on \"visual Hebrew\" pages"
+        RenderText {#text} at (382,20) size 4x19
+          text run at (382,20) width 4 LTR override: "."
+      RenderBlock {HR} at (0,56) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,74) size 784x20
+        RenderText {#text} at (0,0) size 280x19
+          text run at (0,0) width 246 LTR override: "The text on both buttons should like this: "
+          text run at (246,0) width 34 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
+      RenderBlock (anonymous) at (0,110) size 784x41
+        RenderButton {BUTTON} at (0,1) size 46x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
           RenderBlock (anonymous) at (8,2) size 30x16
             RenderText {#text} at (3,1) size 24x14
               text run at (3,1) width 24 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
-        RenderText {#text} at (46,2) size 4x16
-          text run at (46,2) width 4 LTR override: " "
-        RenderBR {BR} at (50,14) size 0x0
-        RenderButton {INPUT} at (0,20) size 46x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+        RenderText {#text} at (46,0) size 4x19
+          text run at (46,0) width 4 LTR override: " "
+        RenderBR {BR} at (50,15) size 0x0
+        RenderButton {INPUT} at (0,21) size 46x20 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
           RenderBlock (anonymous) at (8,2) size 30x16
             RenderText at (3,1) size 24x14
               text run at (3,1) width 24 RTL: "\x{5DB}\x{5E4}\x{5EA}\x{5D5}\x{5E8}"
         RenderText {#text} at (0,0) size 0x0
-      RenderBlock {HR} at (0,146) size 784x2 [border: (1px inset #000000)]
-      RenderBlock {P} at (0,164) size 784x16
-        RenderText {#text} at (0,0) size 251x16
-          text run at (0,0) width 251 LTR override: "The following lines should be identical:"
-      RenderBlock {P} at (0,196) size 784x16
-        RenderText {#text} at (0,0) size 68x16
-          text run at (0,0) width 14: "21"
-          text run at (14,0) width 54 RTL: "\x{5D4}\x{5DE}\x{5D0}\x{5D4} \x{5D4}-"
-      RenderBlock {P} at (0,228) size 784x16
-        RenderText {#text} at (0,0) size 68x16
-          text run at (0,0) width 19 LTR override: "21-"
-          text run at (19,0) width 49 LTR override: "\x{5D4} \x{5D4}\x{5D0}\x{5DE}\x{5D4}"
+      RenderBlock {HR} at (0,159) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,177) size 784x20
+        RenderText {#text} at (0,0) size 229x19
+          text run at (0,0) width 229 LTR override: "The following lines should be identical:"
+      RenderBlock {P} at (0,213) size 784x20
+        RenderText {#text} at (0,0) size 66x19
+          text run at (0,0) width 16: "21"
+          text run at (16,0) width 50 RTL: "\x{5D4}\x{5DE}\x{5D0}\x{5D4} \x{5D4}-"
+      RenderBlock {P} at (0,249) size 784x20
+        RenderText {#text} at (0,0) size 66x19
+          text run at (0,0) width 22 LTR override: "21-"
+          text run at (22,0) width 44 LTR override: "\x{5D4} \x{5D4}\x{5D0}\x{5DE}\x{5D4}"
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt
index a75aab01..d600515 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/dom/object-embed-plugin-scripting-expected.txt
@@ -2,16 +2,16 @@ This test checks for a regression against rdar://problem/4214080 document.embeds
 
 Each test below states its expected outcome.
 
-plugin <object> with nested plugin <embed>: should have a plugin and does not
+plugin <object> with nested plugin <embed>: should have a plugin and does
 
-plugin <embed> netsted in plugin <object>: should have a plugin and does not
+plugin <embed> netsted in plugin <object>: should have a plugin and does
 
-plugin <embed> nested in empty <object>: should have a plugin and does not
+plugin <embed> nested in empty <object>: should have a plugin and does
 
 plugin <embed> nested in image <object>: should not have a plugin and does not
 
 plugin <embed> nested in empty <object> nested in plugin <object>: should not have a plugin and does not
 
-standalone plugin <embed>: should have a plugin and does not
+standalone plugin <embed>: should have a plugin and does
 
-     
+        
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.txt
index d030bf8..e29ca69 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/encoding/denormalised-voiced-japanese-chars-expected.txt
@@ -8,14 +8,14 @@ layer at (0,0) size 800x234
           text run at (0,0) width 784: "This test checks that the decomposed unicode version of voiced japanese hiragana and katakana characters are rendered the same"
           text run at (0,20) width 717: "as the precomposed version. This test is a pixel-test, and passes when the text in the two heading elements are identical."
       RenderBlock {H2} at (0,59) size 784x27
-        RenderText {#text} at (0,0) size 164x26
-          text run at (0,0) width 164: "\x{30CF}\x{3099}\x{30CA}\x{30CA}\x{3068}\x{30CF}\x{309A}\x{30CA}\x{30DE}"
+        RenderText {#text} at (0,0) size 175x26
+          text run at (0,0) width 175: "\x{30CF}\x{3099}\x{30CA}\x{30CA}\x{3068}\x{30CF}\x{309A}\x{30CA}\x{30DE}"
       RenderBlock {P} at (0,105) size 784x20
         RenderText {#text} at (0,0) size 159x19
           text run at (0,0) width 159: "The above is decomposed"
       RenderBlock {H2} at (0,144) size 784x27
-        RenderText {#text} at (0,0) size 164x26
-          text run at (0,0) width 164: "\x{30D0}\x{30CA}\x{30CA}\x{3068}\x{30D1}\x{30CA}\x{30DE}"
+        RenderText {#text} at (0,0) size 175x26
+          text run at (0,0) width 175: "\x{30D0}\x{30CA}\x{30CA}\x{3068}\x{30D1}\x{30CA}\x{30DE}"
       RenderBlock {P} at (0,190) size 784x20
         RenderText {#text} at (0,0) size 164x19
           text run at (0,0) width 164: "The above is precomposed"
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/forms/select-visual-hebrew-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/forms/select-visual-hebrew-expected.txt
index f759b5f..2fcf40a 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/fast/forms/select-visual-hebrew-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/forms/select-visual-hebrew-expected.txt
@@ -3,15 +3,15 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x16
-        RenderText {#text} at (0,0) size 619x16
-          text run at (0,0) width 619 LTR override: "This tests that native pop-ups are rendered in logical order even in visually-ordered Hebrew pages."
-      RenderBlock {HR} at (0,32) size 784x2 [border: (1px inset #000000)]
-      RenderBlock {P} at (0,50) size 784x16
-        RenderText {#text} at (0,0) size 387x16
-          text run at (0,0) width 350 LTR override: "Text on the pop-up and in the list should look like this: "
-          text run at (350,0) width 37 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
-      RenderBlock (anonymous) at (0,82) size 784x18
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 593x19
+          text run at (0,0) width 593 LTR override: "This tests that native pop-ups are rendered in logical order even in visually-ordered Hebrew pages."
+      RenderBlock {HR} at (0,36) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,54) size 784x20
+        RenderText {#text} at (0,0) size 363x19
+          text run at (0,0) width 329 LTR override: "Text on the pop-up and in the list should look like this: "
+          text run at (329,0) width 34 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
+      RenderBlock (anonymous) at (0,90) size 784x18
         RenderMenuList {SELECT} at (0,0) size 55x18 [bgcolor=#FFFFFF]
           RenderBlock (anonymous) at (0,0) size 55x19
             RenderText at (8,2) size 24x14
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/forms/visual-hebrew-text-field-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/forms/visual-hebrew-text-field-expected.txt
index 59dd2e0..e4e5cbf 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/fast/forms/visual-hebrew-text-field-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/forms/visual-hebrew-text-field-expected.txt
@@ -3,29 +3,29 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x32
-        RenderText {#text} at (0,0) size 212x16
-          text run at (0,0) width 212 LTR override: "This tests for a regression against "
-        RenderInline {I} at (0,0) size 774x32
-          RenderInline {A} at (0,0) size 344x16 [color=#0000EE]
-            RenderText {#text} at (212,0) size 344x16
-              text run at (212,0) width 344 LTR override: "http://bugzilla.opendarwin.org/show_bug.cgi?id=8076"
-          RenderText {#text} at (556,0) size 774x32
-            text run at (556,0) width 218 LTR override: " REGRESSION: native text fields"
-            text run at (0,16) width 246 LTR override: "are reversed on \"visual Hebrew\" pages"
-        RenderText {#text} at (246,16) size 4x16
-          text run at (246,16) width 4 LTR override: "."
-      RenderBlock {HR} at (0,48) size 784x2 [border: (1px inset #000000)]
-      RenderBlock {P} at (0,66) size 784x16
-        RenderText {#text} at (0,0) size 278x16
-          text run at (0,0) width 241 LTR override: "Text in the field should look like this: "
-          text run at (241,0) width 37 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
-      RenderBlock (anonymous) at (0,98) size 784x20
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 202x19
+          text run at (0,0) width 202 LTR override: "This tests for a regression against "
+        RenderInline {I} at (0,0) size 765x39
+          RenderInline {A} at (0,0) size 350x19 [color=#0000EE]
+            RenderText {#text} at (202,0) size 350x19
+              text run at (202,0) width 350 LTR override: "http://bugzilla.opendarwin.org/show_bug.cgi?id=8076"
+          RenderText {#text} at (552,0) size 765x39
+            text run at (552,0) width 213 LTR override: " REGRESSION: native text fields"
+            text run at (0,20) width 253 LTR override: "are reversed on \"visual Hebrew\" pages"
+        RenderText {#text} at (253,20) size 4x19
+          text run at (253,20) width 4 LTR override: "."
+      RenderBlock {HR} at (0,56) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,74) size 784x20
+        RenderText {#text} at (0,0) size 256x19
+          text run at (0,0) width 222 LTR override: "Text in the field should look like this: "
+          text run at (222,0) width 34 LTR override: "\x{5E8}\x{5D5}\x{5EA}\x{5E4}\x{5DB}"
+      RenderBlock (anonymous) at (0,110) size 784x20
         RenderTextControl {INPUT} at (0,0) size 110x20 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
-layer at (10,109) size 106x14
+layer at (10,121) size 106x14
   RenderBlock {DIV} at (2,3) size 106x14
     RenderText {#text} at (1,0) size 24x14
       text run at (1,0) width 24 RTL: "\x{5DB}\x{5E4}\x{5EA}\x{5D5}\x{5E8}"
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/lists/w3-list-styles-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/lists/w3-list-styles-expected.txt
index a903725..cab8370 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/fast/lists/w3-list-styles-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/lists/w3-list-styles-expected.txt
@@ -433,63 +433,63 @@ layer at (0,0) size 785x6628
       RenderBlock {DIV} at (0,2913) size 769x352
         RenderBlock {OL} at (0,0) size 769x168
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-28,0) size 23x19: "\x{3042}"
-            RenderText {#text} at (0,0) size 110x19
-              text run at (0,0) width 110: "one, may show \x{3042}"
+            RenderListMarker at (-29,0) size 24x19: "\x{3042}"
+            RenderText {#text} at (0,0) size 111x19
+              text run at (0,0) width 111: "one, may show \x{3042}"
           RenderListItem {LI} at (40,20) size 729x88
             RenderBlock (anonymous) at (0,0) size 729x20
-              RenderListMarker at (-28,0) size 23x19: "\x{3044}"
-              RenderText {#text} at (0,0) size 111x19
-                text run at (0,0) width 111: "two, may show \x{3044}"
+              RenderListMarker at (-29,0) size 24x19: "\x{3044}"
+              RenderText {#text} at (0,0) size 112x19
+                text run at (0,0) width 112: "two, may show \x{3044}"
             RenderBlock {OL} at (0,28) size 729x60
               RenderListItem {LI} at (40,0) size 689x20
-                RenderListMarker at (-28,0) size 23x19: "\x{3042}"
-                RenderText {#text} at (0,0) size 110x19
-                  text run at (0,0) width 110: "one, may show \x{3042}"
-              RenderListItem {LI} at (40,20) size 689x20
-                RenderListMarker at (-28,0) size 23x19: "\x{3044}"
+                RenderListMarker at (-29,0) size 24x19: "\x{3042}"
                 RenderText {#text} at (0,0) size 111x19
-                  text run at (0,0) width 111: "two, may show \x{3044}"
+                  text run at (0,0) width 111: "one, may show \x{3042}"
+              RenderListItem {LI} at (40,20) size 689x20
+                RenderListMarker at (-29,0) size 24x19: "\x{3044}"
+                RenderText {#text} at (0,0) size 112x19
+                  text run at (0,0) width 112: "two, may show \x{3044}"
               RenderListItem {LI} at (40,40) size 689x20
-                RenderListMarker at (-24,0) size 19x19: "\x{3046}"
-                RenderText {#text} at (0,0) size 114x19
-                  text run at (0,0) width 114: "three, may show \x{3046}"
+                RenderListMarker at (-29,0) size 24x19: "\x{3046}"
+                RenderText {#text} at (0,0) size 119x19
+                  text run at (0,0) width 119: "three, may show \x{3046}"
           RenderListItem {LI} at (40,108) size 729x20
-            RenderListMarker at (-24,0) size 19x19: "\x{3046}"
-            RenderText {#text} at (0,0) size 114x19
-              text run at (0,0) width 114: "three, may show \x{3046}"
+            RenderListMarker at (-29,0) size 24x19: "\x{3046}"
+            RenderText {#text} at (0,0) size 119x19
+              text run at (0,0) width 119: "three, may show \x{3046}"
           RenderListItem {LI} at (40,128) size 729x20
-            RenderListMarker at (-27,0) size 22x19: "\x{3048}"
-            RenderText {#text} at (0,0) size 111x19
-              text run at (0,0) width 111: "four, may show \x{3048}"
+            RenderListMarker at (-29,0) size 24x19: "\x{3048}"
+            RenderText {#text} at (0,0) size 113x19
+              text run at (0,0) width 113: "four, may show \x{3048}"
           RenderListItem {LI} at (40,148) size 729x20
-            RenderListMarker at (-28,0) size 23x19: "\x{304A}"
-            RenderText {#text} at (0,0) size 109x19
-              text run at (0,0) width 109: "five, may show \x{304A}"
+            RenderListMarker at (-29,0) size 24x19: "\x{304A}"
+            RenderText {#text} at (0,0) size 110x19
+              text run at (0,0) width 110: "five, may show \x{304A}"
         RenderBlock {OL} at (0,200) size 769x60
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-28,0) size 23x19: "\x{3093}"
-            RenderText {#text} at (0,0) size 150x19
-              text run at (0,0) width 150: "forty-eight, may show \x{3093}"
+            RenderListMarker at (-29,0) size 24x19: "\x{3093}"
+            RenderText {#text} at (0,0) size 151x19
+              text run at (0,0) width 151: "forty-eight, may show \x{3093}"
           RenderListItem {LI} at (40,20) size 729x20
-            RenderListMarker at (-43,0) size 38x19: "\x{3042}\x{3042}"
+            RenderListMarker at (-45,0) size 40x19: "\x{3042}\x{3042}"
             RenderText {#text} at (0,0) size 124x19
               text run at (0,0) width 124: "forty-nine, undefined"
           RenderListItem {LI} at (40,40) size 729x20
-            RenderListMarker at (-43,0) size 38x19: "\x{3042}\x{3044}"
+            RenderListMarker at (-45,0) size 40x19: "\x{3042}\x{3044}"
             RenderText {#text} at (0,0) size 88x19
               text run at (0,0) width 88: "fifty, undefined"
         RenderBlock {OL} at (0,292) size 769x60
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-43,0) size 38x19: "\x{3042}\x{3093}"
+            RenderListMarker at (-45,0) size 40x19: "\x{3042}\x{3093}"
             RenderText {#text} at (0,0) size 123x19
               text run at (0,0) width 123: "ninety-six, undefined"
           RenderListItem {LI} at (40,20) size 729x20
-            RenderListMarker at (-43,0) size 38x19: "\x{3044}\x{3042}"
+            RenderListMarker at (-45,0) size 40x19: "\x{3044}\x{3042}"
             RenderText {#text} at (0,0) size 141x19
               text run at (0,0) width 141: "ninety-seven, undefined"
           RenderListItem {LI} at (40,40) size 729x20
-            RenderListMarker at (-43,0) size 38x19: "\x{3044}\x{3044}"
+            RenderListMarker at (-45,0) size 40x19: "\x{3044}\x{3044}"
             RenderText {#text} at (0,0) size 135x19
               text run at (0,0) width 135: "ninety-eight, undefined"
       RenderBlock {H2} at (0,3297) size 769x27
@@ -508,25 +508,25 @@ layer at (0,0) size 785x6628
       RenderBlock {DIV} at (0,3415) size 769x352
         RenderBlock {OL} at (0,0) size 769x168
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-28,0) size 23x19: "\x{3044}"
-            RenderText {#text} at (0,0) size 110x19
-              text run at (0,0) width 110: "one, may show \x{3044}"
+            RenderListMarker at (-29,0) size 24x19: "\x{3044}"
+            RenderText {#text} at (0,0) size 111x19
+              text run at (0,0) width 111: "one, may show \x{3044}"
           RenderListItem {LI} at (40,20) size 729x88
             RenderBlock (anonymous) at (0,0) size 729x20
-              RenderListMarker at (-27,0) size 22x19: "\x{308D}"
-              RenderText {#text} at (0,0) size 110x19
-                text run at (0,0) width 110: "two, may show \x{308D}"
+              RenderListMarker at (-29,0) size 24x19: "\x{308D}"
+              RenderText {#text} at (0,0) size 112x19
+                text run at (0,0) width 112: "two, may show \x{308D}"
             RenderBlock {OL} at (0,28) size 729x60
               RenderListItem {LI} at (40,0) size 689x20
-                RenderListMarker at (-28,0) size 23x19: "\x{3042}"
-                RenderText {#text} at (0,0) size 110x19
-                  text run at (0,0) width 110: "one, may show \x{3044}"
+                RenderListMarker at (-29,0) size 24x19: "\x{3042}"
+                RenderText {#text} at (0,0) size 111x19
+                  text run at (0,0) width 111: "one, may show \x{3044}"
               RenderListItem {LI} at (40,20) size 689x20
-                RenderListMarker at (-28,0) size 23x19: "\x{3044}"
-                RenderText {#text} at (0,0) size 110x19
-                  text run at (0,0) width 110: "two, may show \x{308D}"
+                RenderListMarker at (-29,0) size 24x19: "\x{3044}"
+                RenderText {#text} at (0,0) size 112x19
+                  text run at (0,0) width 112: "two, may show \x{308D}"
               RenderListItem {LI} at (40,40) size 689x20
-                RenderListMarker at (-24,0) size 19x19: "\x{3046}"
+                RenderListMarker at (-29,0) size 24x19: "\x{3046}"
                 RenderText {#text} at (0,0) size 119x19
                   text run at (0,0) width 119: "three, may show \x{306F}"
           RenderListItem {LI} at (40,108) size 729x20
@@ -534,37 +534,37 @@ layer at (0,0) size 785x6628
             RenderText {#text} at (0,0) size 119x19
               text run at (0,0) width 119: "three, may show \x{306F}"
           RenderListItem {LI} at (40,128) size 729x20
-            RenderListMarker at (-28,0) size 23x19: "\x{306B}"
-            RenderText {#text} at (0,0) size 112x19
-              text run at (0,0) width 112: "four, may show \x{306B}"
+            RenderListMarker at (-29,0) size 24x19: "\x{306B}"
+            RenderText {#text} at (0,0) size 113x19
+              text run at (0,0) width 113: "four, may show \x{306B}"
           RenderListItem {LI} at (40,148) size 729x20
             RenderListMarker at (-29,0) size 24x19: "\x{307B}"
             RenderText {#text} at (0,0) size 110x19
               text run at (0,0) width 110: "five, may show \x{307B}"
         RenderBlock {OL} at (0,200) size 769x60
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-28,0) size 23x19: "\x{3059}"
-            RenderText {#text} at (0,0) size 156x19
-              text run at (0,0) width 156: "forty-seven, may show \x{3059}"
+            RenderListMarker at (-29,0) size 24x19: "\x{3059}"
+            RenderText {#text} at (0,0) size 157x19
+              text run at (0,0) width 157: "forty-seven, may show \x{3059}"
           RenderListItem {LI} at (40,20) size 729x20
-            RenderListMarker at (-43,0) size 38x19: "\x{3044}\x{3044}"
+            RenderListMarker at (-45,0) size 40x19: "\x{3044}\x{3044}"
             RenderText {#text} at (0,0) size 128x19
               text run at (0,0) width 128: "forty-eight, undefined"
           RenderListItem {LI} at (40,40) size 729x20
-            RenderListMarker at (-42,0) size 37x19: "\x{3044}\x{308D}"
+            RenderListMarker at (-45,0) size 40x19: "\x{3044}\x{308D}"
             RenderText {#text} at (0,0) size 124x19
               text run at (0,0) width 124: "forty-nine, undefined"
         RenderBlock {OL} at (0,292) size 769x60
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-43,0) size 38x19: "\x{3044}\x{3059}"
+            RenderListMarker at (-45,0) size 40x19: "\x{3044}\x{3059}"
             RenderText {#text} at (0,0) size 131x19
               text run at (0,0) width 131: "ninety-four, undefined"
           RenderListItem {LI} at (40,20) size 729x20
-            RenderListMarker at (-42,0) size 37x19: "\x{308D}\x{3044}"
+            RenderListMarker at (-45,0) size 40x19: "\x{308D}\x{3044}"
             RenderText {#text} at (0,0) size 128x19
               text run at (0,0) width 128: "ninety-five, undefined"
           RenderListItem {LI} at (40,40) size 729x20
-            RenderListMarker at (-41,0) size 36x19: "\x{308D}\x{308D}"
+            RenderListMarker at (-45,0) size 40x19: "\x{308D}\x{308D}"
             RenderText {#text} at (0,0) size 123x19
               text run at (0,0) width 123: "ninety-six, undefined"
       RenderBlock {H2} at (0,3799) size 769x27
@@ -584,63 +584,63 @@ layer at (0,0) size 785x6628
       RenderBlock {DIV} at (0,3917) size 769x352
         RenderBlock {OL} at (0,0) size 769x168
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-27,0) size 22x19: "\x{30A2}"
-            RenderText {#text} at (0,0) size 109x19
-              text run at (0,0) width 109: "one, may show \x{30A2}"
+            RenderListMarker at (-29,0) size 24x19: "\x{30A2}"
+            RenderText {#text} at (0,0) size 111x19
+              text run at (0,0) width 111: "one, may show \x{30A2}"
           RenderListItem {LI} at (40,20) size 729x88
             RenderBlock (anonymous) at (0,0) size 729x20
-              RenderListMarker at (-26,0) size 21x19: "\x{30A4}"
-              RenderText {#text} at (0,0) size 109x19
-                text run at (0,0) width 109: "two, may show \x{30A4}"
+              RenderListMarker at (-29,0) size 24x19: "\x{30A4}"
+              RenderText {#text} at (0,0) size 112x19
+                text run at (0,0) width 112: "two, may show \x{30A4}"
             RenderBlock {OL} at (0,28) size 729x60
               RenderListItem {LI} at (40,0) size 689x20
-                RenderListMarker at (-27,0) size 22x19: "\x{30A2}"
-                RenderText {#text} at (0,0) size 109x19
-                  text run at (0,0) width 109: "one, may show \x{30A2}"
+                RenderListMarker at (-29,0) size 24x19: "\x{30A2}"
+                RenderText {#text} at (0,0) size 111x19
+                  text run at (0,0) width 111: "one, may show \x{30A2}"
               RenderListItem {LI} at (40,20) size 689x20
-                RenderListMarker at (-26,0) size 21x19: "\x{30A4}"
-                RenderText {#text} at (0,0) size 109x19
-                  text run at (0,0) width 109: "two, may show \x{30A4}"
+                RenderListMarker at (-29,0) size 24x19: "\x{30A4}"
+                RenderText {#text} at (0,0) size 112x19
+                  text run at (0,0) width 112: "two, may show \x{30A4}"
               RenderListItem {LI} at (40,40) size 689x20
-                RenderListMarker at (-28,0) size 23x19: "\x{30A6}"
-                RenderText {#text} at (0,0) size 118x19
-                  text run at (0,0) width 118: "three, may show \x{30A6}"
+                RenderListMarker at (-29,0) size 24x19: "\x{30A6}"
+                RenderText {#text} at (0,0) size 119x19
+                  text run at (0,0) width 119: "three, may show \x{30A6}"
           RenderListItem {LI} at (40,108) size 729x20
-            RenderListMarker at (-28,0) size 23x19: "\x{30A6}"
-            RenderText {#text} at (0,0) size 118x19
-              text run at (0,0) width 118: "three, may show \x{30A6}"
+            RenderListMarker at (-29,0) size 24x19: "\x{30A6}"
+            RenderText {#text} at (0,0) size 119x19
+              text run at (0,0) width 119: "three, may show \x{30A6}"
           RenderListItem {LI} at (40,128) size 729x20
-            RenderListMarker at (-27,0) size 22x19: "\x{30A8}"
-            RenderText {#text} at (0,0) size 111x19
-              text run at (0,0) width 111: "four, may show \x{30A8}"
+            RenderListMarker at (-29,0) size 24x19: "\x{30A8}"
+            RenderText {#text} at (0,0) size 113x19
+              text run at (0,0) width 113: "four, may show \x{30A8}"
           RenderListItem {LI} at (40,148) size 729x20
-            RenderListMarker at (-28,0) size 23x19: "\x{30AA}"
-            RenderText {#text} at (0,0) size 109x19
-              text run at (0,0) width 109: "five, may show \x{30AA}"
+            RenderListMarker at (-29,0) size 24x19: "\x{30AA}"
+            RenderText {#text} at (0,0) size 110x19
+              text run at (0,0) width 110: "five, may show \x{30AA}"
         RenderBlock {OL} at (0,200) size 769x60
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-27,0) size 22x19: "\x{30F3}"
+            RenderListMarker at (-29,0) size 24x19: "\x{30F3}"
             RenderText {#text} at (0,0) size 128x19
               text run at (0,0) width 128: "forty-eight, undefined"
           RenderListItem {LI} at (40,20) size 729x20
-            RenderListMarker at (-41,0) size 36x19: "\x{30A2}\x{30A2}"
+            RenderListMarker at (-45,0) size 40x19: "\x{30A2}\x{30A2}"
             RenderText {#text} at (0,0) size 124x19
               text run at (0,0) width 124: "forty-nine, undefined"
           RenderListItem {LI} at (40,40) size 729x20
-            RenderListMarker at (-40,0) size 35x19: "\x{30A2}\x{30A4}"
+            RenderListMarker at (-45,0) size 40x19: "\x{30A2}\x{30A4}"
             RenderText {#text} at (0,0) size 88x19
               text run at (0,0) width 88: "fifty, undefined"
         RenderBlock {OL} at (0,292) size 769x60
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-41,0) size 36x19: "\x{30A2}\x{30F3}"
+            RenderListMarker at (-45,0) size 40x19: "\x{30A2}\x{30F3}"
             RenderText {#text} at (0,0) size 123x19
               text run at (0,0) width 123: "ninety-six, undefined"
           RenderListItem {LI} at (40,20) size 729x20
-            RenderListMarker at (-40,0) size 35x19: "\x{30A4}\x{30A2}"
+            RenderListMarker at (-45,0) size 40x19: "\x{30A4}\x{30A2}"
             RenderText {#text} at (0,0) size 141x19
               text run at (0,0) width 141: "ninety-seven, undefined"
           RenderListItem {LI} at (40,40) size 729x20
-            RenderListMarker at (-39,0) size 34x19: "\x{30A4}\x{30A4}"
+            RenderListMarker at (-45,0) size 40x19: "\x{30A4}\x{30A4}"
             RenderText {#text} at (0,0) size 135x19
               text run at (0,0) width 135: "ninety-eight, undefined"
       RenderBlock {H2} at (0,4301) size 769x27
@@ -660,25 +660,25 @@ layer at (0,0) size 785x6628
       RenderBlock {DIV} at (0,4419) size 769x352
         RenderBlock {OL} at (0,0) size 769x168
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-26,0) size 21x19: "\x{30A4}"
-            RenderText {#text} at (0,0) size 108x19
-              text run at (0,0) width 108: "one, may show \x{30A4}"
+            RenderListMarker at (-29,0) size 24x19: "\x{30A4}"
+            RenderText {#text} at (0,0) size 111x19
+              text run at (0,0) width 111: "one, may show \x{30A4}"
           RenderListItem {LI} at (40,20) size 729x88
             RenderBlock (anonymous) at (0,0) size 729x20
-              RenderListMarker at (-27,0) size 22x19: "\x{30ED}"
-              RenderText {#text} at (0,0) size 110x19
-                text run at (0,0) width 110: "two, may show \x{30ED}"
+              RenderListMarker at (-29,0) size 24x19: "\x{30ED}"
+              RenderText {#text} at (0,0) size 112x19
+                text run at (0,0) width 112: "two, may show \x{30ED}"
             RenderBlock {OL} at (0,28) size 729x60
               RenderListItem {LI} at (40,0) size 689x20
-                RenderListMarker at (-28,0) size 23x19: "\x{3042}"
-                RenderText {#text} at (0,0) size 108x19
-                  text run at (0,0) width 108: "one, may show \x{30A4}"
+                RenderListMarker at (-29,0) size 24x19: "\x{3042}"
+                RenderText {#text} at (0,0) size 111x19
+                  text run at (0,0) width 111: "one, may show \x{30A4}"
               RenderListItem {LI} at (40,20) size 689x20
-                RenderListMarker at (-28,0) size 23x19: "\x{3044}"
-                RenderText {#text} at (0,0) size 110x19
-                  text run at (0,0) width 110: "two, may show \x{30ED}"
+                RenderListMarker at (-29,0) size 24x19: "\x{3044}"
+                RenderText {#text} at (0,0) size 112x19
+                  text run at (0,0) width 112: "two, may show \x{30ED}"
               RenderListItem {LI} at (40,40) size 689x20
-                RenderListMarker at (-24,0) size 19x19: "\x{3046}"
+                RenderListMarker at (-29,0) size 24x19: "\x{3046}"
                 RenderText {#text} at (0,0) size 119x19
                   text run at (0,0) width 119: "three, may show \x{30CF}"
           RenderListItem {LI} at (40,108) size 729x20
@@ -686,37 +686,37 @@ layer at (0,0) size 785x6628
             RenderText {#text} at (0,0) size 119x19
               text run at (0,0) width 119: "three, may show \x{30CF}"
           RenderListItem {LI} at (40,128) size 729x20
-            RenderListMarker at (-28,0) size 23x19: "\x{30CB}"
-            RenderText {#text} at (0,0) size 112x19
-              text run at (0,0) width 112: "four, may show \x{30CB}"
+            RenderListMarker at (-29,0) size 24x19: "\x{30CB}"
+            RenderText {#text} at (0,0) size 113x19
+              text run at (0,0) width 113: "four, may show \x{30CB}"
           RenderListItem {LI} at (40,148) size 729x20
-            RenderListMarker at (-28,0) size 23x19: "\x{30DB}"
-            RenderText {#text} at (0,0) size 109x19
-              text run at (0,0) width 109: "five, may show \x{30DB}"
+            RenderListMarker at (-29,0) size 24x19: "\x{30DB}"
+            RenderText {#text} at (0,0) size 110x19
+              text run at (0,0) width 110: "five, may show \x{30DB}"
         RenderBlock {OL} at (0,200) size 769x60
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-27,0) size 22x19: "\x{30B9}"
-            RenderText {#text} at (0,0) size 155x19
-              text run at (0,0) width 155: "forty-seven, may show \x{30B9}"
+            RenderListMarker at (-29,0) size 24x19: "\x{30B9}"
+            RenderText {#text} at (0,0) size 157x19
+              text run at (0,0) width 157: "forty-seven, may show \x{30B9}"
           RenderListItem {LI} at (40,20) size 729x20
-            RenderListMarker at (-39,0) size 34x19: "\x{30A4}\x{30A4}"
+            RenderListMarker at (-45,0) size 40x19: "\x{30A4}\x{30A4}"
             RenderText {#text} at (0,0) size 128x19
               text run at (0,0) width 128: "forty-eight, undefined"
           RenderListItem {LI} at (40,40) size 729x20
-            RenderListMarker at (-40,0) size 35x19: "\x{30A4}\x{30ED}"
+            RenderListMarker at (-45,0) size 40x19: "\x{30A4}\x{30ED}"
             RenderText {#text} at (0,0) size 124x19
               text run at (0,0) width 124: "forty-nine, undefined"
         RenderBlock {OL} at (0,292) size 769x60
           RenderListItem {LI} at (40,0) size 729x20
-            RenderListMarker at (-40,0) size 35x19: "\x{30A4}\x{30B9}"
+            RenderListMarker at (-45,0) size 40x19: "\x{30A4}\x{30B9}"
             RenderText {#text} at (0,0) size 131x19
               text run at (0,0) width 131: "ninety-four, undefined"
           RenderListItem {LI} at (40,20) size 729x20
-            RenderListMarker at (-40,0) size 35x19: "\x{30ED}\x{30A4}"
+            RenderListMarker at (-45,0) size 40x19: "\x{30ED}\x{30A4}"
             RenderText {#text} at (0,0) size 128x19
               text run at (0,0) width 128: "ninety-five, undefined"
           RenderListItem {LI} at (40,40) size 729x20
-            RenderListMarker at (-41,0) size 36x19: "\x{30ED}\x{30ED}"
+            RenderListMarker at (-45,0) size 40x19: "\x{30ED}\x{30ED}"
             RenderText {#text} at (0,0) size 123x19
               text run at (0,0) width 123: "ninety-six, undefined"
       RenderBlock {H2} at (0,4803) size 769x27
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/repaint/continuation-after-outline-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/repaint/continuation-after-outline-expected.txt
index 74aa009..b6ac7ce 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/fast/repaint/continuation-after-outline-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/repaint/continuation-after-outline-expected.txt
@@ -14,7 +14,7 @@ layer at (0,0) size 800x96
               text run at (21,0) width 7: "x"
           RenderText {#text} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,60) size 784x20
-        RenderText {#text} at (0,0) size 0x19
-          text run at (0,0) width 0: "\x{19}"
+        RenderText {#text} at (0,0) size 4x19
+          text run at (0,0) width 4: "\x{19}"
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/001-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/001-expected.txt
new file mode 100644
index 0000000..80d43bf
--- /dev/null
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/001-expected.txt
@@ -0,0 +1,28 @@
+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 784x584
+      RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+        RenderText {#text} at (0,0) size 32x19
+          text run at (0,0) width 32: "\x{5EFA}\x{7BC9}"
+      RenderText {#text} at (32,0) size 8x19
+        text run at (32,0) width 8: ", "
+      RenderInline {A} at (0,0) size 48x19 [color=#0000EE]
+        RenderText {#text} at (40,0) size 48x19
+          text run at (40,0) width 48: "\x{7F8E}\x{8853}\x{9928}"
+      RenderText {#text} at (88,0) size 8x19
+        text run at (88,0) width 8: ", "
+      RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+        RenderText {#text} at (96,0) size 32x19
+          text run at (96,0) width 32: "\x{6B74}\x{53F2}"
+      RenderText {#text} at (128,0) size 8x19
+        text run at (128,0) width 8: ", "
+      RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+        RenderText {#text} at (136,0) size 32x19
+          text run at (136,0) width 32: "\x{6587}\x{5B66}"
+      RenderText {#text} at (168,0) size 23x19
+        text run at (168,0) width 4: " "
+        text run at (172,0) width 19: "...a"
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/002-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/002-expected.txt
new file mode 100644
index 0000000..1f6716f
--- /dev/null
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/002-expected.txt
@@ -0,0 +1,17 @@
+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 784x584
+      RenderTable {TABLE} at (0,0) size 280x120
+        RenderTableSection {TBODY} at (0,0) size 280x120
+          RenderTableRow {TR} at (0,0) size 280x120
+            RenderTableCell {TD} at (0,0) size 280x120 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 276x119
+                text run at (0,0) width 272: "\x{8AB0}\x{3067}\x{3082}\x{3042}\x{306A}\x{305F}\x{306E}\x{30C9}\x{30AD}\x{30E5}\x{30E1}\x{30F3}\x{30C8}\x{3092}\x{30AA}\x{30EA}\x{30B8}"
+                text run at (0,20) width 260: "\x{30CA}\x{30EB}\x{306E}\x{4F53}\x{88C1}\x{3067}\x{958B}\x{304F}\x{3053}\x{3068}\x{304C}\x{3067}\x{304D}\x{307E}\x{3059}\x{3002} "
+                text run at (260,20) width 16: "\x{3042}"
+                text run at (0,40) width 272: "\x{306A}\x{305F}\x{306E}\x{610F}\x{56F3}\x{3057}\x{305F}\x{3068}\x{304A}\x{308A}\x{306B}\x{60C5}\x{5831}\x{3092}\x{4F1D}\x{3048}\x{308B}"
+                text run at (0,60) width 272: "\x{3053}\x{3068}\x{304C}\x{3067}\x{304D}\x{307E}\x{3059}\x{3002}\x{3055}\x{3089}\x{306B}\x{3001}\x{30D6}\x{30E9}\x{30A6}\x{30B6}\x{304B}"
+                text run at (0,80) width 272: "\x{3089}\x{30B3}\x{30E1}\x{30F3}\x{30C8}\x{3084}\x{30DE}\x{30FC}\x{30AF}\x{30A2}\x{30C3}\x{30D7}\x{3092}\x{66F8}\x{304D}\x{8FBC}\x{3093}"
+                text run at (0,100) width 32: "\x{3060}\x{308A}"
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/003-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/003-expected.txt
new file mode 100644
index 0000000..d563aca
--- /dev/null
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/003-expected.txt
@@ -0,0 +1,96 @@
+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 784x584
+      RenderTable {TABLE} at (0,0) size 784x358 [border: (5px outset #808080)]
+        RenderTableSection {TBODY} at (5,5) size 774x348
+          RenderTableRow {TR} at (0,2) size 774x344
+            RenderTableCell {TD} at (2,172) size 716x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+            RenderTableCell {TD} at (720,2) size 52x344 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderInline {A} at (0,0) size 16x39 [color=#0000EE]
+                RenderText {#text} at (2,2) size 16x39
+                  text run at (2,2) width 16: "\x{5CA1}"
+                  text run at (2,22) width 16: "\x{5C71}"
+              RenderText {#text} at (18,22) size 16x19
+                text run at (18,22) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,22) size 48x39
+                  text run at (34,22) width 16: "\x{5E83}"
+                  text run at (2,42) width 16: "\x{5CF6}"
+              RenderText {#text} at (18,42) size 16x19
+                text run at (18,42) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,42) size 48x39
+                  text run at (34,42) width 16: "\x{5C71}"
+                  text run at (2,62) width 16: "\x{53E3}"
+              RenderText {#text} at (18,62) size 16x19
+                text run at (18,62) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,62) size 48x39
+                  text run at (34,62) width 16: "\x{5FB3}"
+                  text run at (2,82) width 16: "\x{5CF6}"
+              RenderText {#text} at (18,82) size 16x19
+                text run at (18,82) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,82) size 48x39
+                  text run at (34,82) width 16: "\x{9999}"
+                  text run at (2,102) width 16: "\x{5DDD}"
+              RenderText {#text} at (18,102) size 16x19
+                text run at (18,102) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,102) size 48x39
+                  text run at (34,102) width 16: "\x{611B}"
+                  text run at (2,122) width 16: "\x{5A9B}"
+              RenderText {#text} at (18,122) size 16x19
+                text run at (18,122) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,122) size 48x39
+                  text run at (34,122) width 16: "\x{9AD8}"
+                  text run at (2,142) width 16: "\x{77E5}"
+              RenderText {#text} at (18,142) size 16x19
+                text run at (18,142) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x79 [color=#0000EE]
+                RenderText {#text} at (34,142) size 48x79
+                  text run at (34,142) width 16: "\x{798F}"
+                  text run at (2,162) width 48: "\x{5CA1}\x{30FB}\x{5317}"
+                  text run at (2,182) width 16: "\x{4E5D}"
+                  text run at (2,202) width 16: "\x{5DDE}"
+              RenderText {#text} at (18,202) size 16x19
+                text run at (18,202) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,202) size 48x39
+                  text run at (34,202) width 16: "\x{4F50}"
+                  text run at (2,222) width 16: "\x{8CC0}"
+              RenderText {#text} at (18,222) size 16x19
+                text run at (18,222) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,222) size 48x39
+                  text run at (34,222) width 16: "\x{9577}"
+                  text run at (2,242) width 16: "\x{5D0E}"
+              RenderText {#text} at (18,242) size 16x19
+                text run at (18,242) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,242) size 48x39
+                  text run at (34,242) width 16: "\x{718A}"
+                  text run at (2,262) width 16: "\x{672C}"
+              RenderText {#text} at (18,262) size 16x19
+                text run at (18,262) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,262) size 48x39
+                  text run at (34,262) width 16: "\x{5927}"
+                  text run at (2,282) width 16: "\x{5206}"
+              RenderText {#text} at (18,282) size 16x19
+                text run at (18,282) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,282) size 48x39
+                  text run at (34,282) width 16: "\x{5BAE}"
+                  text run at (2,302) width 16: "\x{5D0E}"
+              RenderText {#text} at (18,302) size 16x19
+                text run at (18,302) width 16: "\x{FF5C}"
+              RenderInline {A} at (0,0) size 48x39 [color=#0000EE]
+                RenderText {#text} at (34,302) size 48x39
+                  text run at (34,302) width 16: "\x{9E7F}"
+                  text run at (2,322) width 32: "\x{5150}\x{5CF6}"
+              RenderText {#text} at (34,322) size 16x19
+                text run at (34,322) width 16: "\x{FF5C}"
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/wrap-CJK-001-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/wrap-CJK-001-expected.txt
index a1e86d3..84ce759 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/wrap-CJK-001-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/international/wrap-CJK-001-expected.txt
@@ -7,7 +7,7 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 359x15
           text run at (0,0) width 359: "Tests that wrapping does not trim the last character if it is not whitespace."
       RenderBlock {P} at (0,28) size 551x38 [border: (3px solid #FF0000)]
-        RenderText {#text} at (3,3) size 545x31
-          text run at (3,3) width 545: "\x{6700}\x{5927}2GHz\x{306E}Intel Core Duo\x{30D7}\x{30ED}\x{30BB}\x{30C3}\x{30B5}\x{306E}\x{30D1}\x{30EF}\x{30FC}\x{3001}iSight\x{30AB}\x{30E1}\x{30E9}\x{3001}Front Row\x{3001}iLife \x{2019}06\x{3001}13\x{30A4}\x{30F3}\x{30C1}\x{306E}\x{30AF}\x{30EA}\x{30A2}\x{30EF}\x{30A4}\x{30C9}\x{30B9}"
-          text run at (3,19) width 103: "\x{30AF}\x{30EA}\x{30FC}\x{30F3}\x{30C7}\x{30A3}\x{30B9}\x{30D7}\x{30EC}\x{30A4}"
+        RenderText {#text} at (3,3) size 535x31
+          text run at (3,3) width 535: "\x{6700}\x{5927}2GHz\x{306E}Intel Core Duo\x{30D7}\x{30ED}\x{30BB}\x{30C3}\x{30B5}\x{306E}\x{30D1}\x{30EF}\x{30FC}\x{3001}iSight\x{30AB}\x{30E1}\x{30E9}\x{3001}Front Row\x{3001}iLife \x{2019}06\x{3001}13\x{30A4}\x{30F3}\x{30C1}\x{306E}\x{30AF}\x{30EA}"
+          text run at (3,19) width 180: "\x{30A2}\x{30EF}\x{30A4}\x{30C9}\x{30B9}\x{30AF}\x{30EA}\x{30FC}\x{30F3}\x{30C7}\x{30A3}\x{30B9}\x{30D7}\x{30EC}\x{30A4}"
         RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/line-breaks-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/line-breaks-expected.txt
index 03ebd63..54a6f92 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/line-breaks-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/fast/text/line-breaks-expected.txt
@@ -24,8 +24,8 @@ layer at (0,0) size 800x486
             text run at (44,1) width 55: "Lorem"
             text run at (48,25) width 51: "\x{131}psum"
         RenderBlock {P} at (0,142) size 100x50 [border: (1px solid #0000FF)]
-          RenderText {#text} at (42,1) size 57x47
-            text run at (42,1) width 57: "Lore\x{1E3F}"
+          RenderText {#text} at (44,1) size 55x47
+            text run at (44,1) width 55: "Lore\x{1E3F}"
             text run at (48,25) width 51: "ipsum"
       RenderBlock (anonymous) at (0,366) size 784x20
         RenderText {#text} at (0,0) size 68x19
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/plugins/embed-attributes-setting-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/plugins/embed-attributes-setting-expected.txt
index 495c95c..9da3aee 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/plugins/embed-attributes-setting-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/plugins/embed-attributes-setting-expected.txt
@@ -5,11 +5,11 @@ PASS: embed.getAttribute('name') should be 1 and is.
 PASS: embed.getAttribute('width') should be 1 and is.
 PASS: embed.getAttribute('type') should be 1 and is.
 PASS: embed.getAttribute('src') should be 1 and is.
-FAIL: typeof embed.Play should be function but instead is undefined.
+PASS: typeof embed.Play should be function and is.
 ----------
 [Embed is dynamically created element with only type specified]
-FAIL: typeof embed.Play should be function but instead is undefined.
+PASS: typeof embed.Play should be function and is.
 ----------
 [Embed is dynamically created element with only src specified]
-FAIL: typeof embed.Play should be function but instead is undefined.
+PASS: typeof embed.Play should be function and is.
  
diff --git a/webkit/data/layout_test_results/kjs/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt b/webkit/data/layout_test_results/kjs/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt
index 40f1195..1aef145 100644
--- a/webkit/data/layout_test_results/kjs/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt
+++ b/webkit/data/layout_test_results/kjs/LayoutTests/tables/mozilla/images/adforce_imgis_com-expected.txt
@@ -3,5 +3,5 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
-      RenderText {#text} at (0,0) size 632x19
-        text run at (0,0) width 632: "GIF89a\x{D4}\x{1}<\x{20AC}\x{7F}!\x{FF}\x{B}NETSCAPE2.0\x{3}\x{1}!\x{F9}\x{4}\x{4}<,\x{D4}\x{1}<\x{201A}\x{7F}\x{FF}\x{FF}\x{FF}\x{FF}\x{FF}\x{DF}\x{DF}\x{DF}\x{BF}\x{BF}\x{BF}\x{7F}\x{7F}\x{7F}\x{3}\x{FF}8\x{BA}\x{DC}\x{FE}0\x{CA}I\x{AB}\x{BD}8\x{EB}\x{CD}\x{BB}\x{FF}`(\x{17D}di*\x{C6} \x{AC}l\x{EB}\x{BE}p,\x{CF}tm\x{DF}x\x{AE}\x{EF}|\x{EF}\x{FF}\x{C0} pH,"
+      RenderText {#text} at (0,0) size 664x19
+        text run at (0,0) width 664: "GIF89a\x{D4}\x{1}<\x{20AC}\x{7F}!\x{FF}\x{B}NETSCAPE2.0\x{3}\x{1}!\x{F9}\x{4}\x{4}<,\x{D4}\x{1}<\x{201A}\x{7F}\x{FF}\x{FF}\x{FF}\x{FF}\x{FF}\x{DF}\x{DF}\x{DF}\x{BF}\x{BF}\x{BF}\x{7F}\x{7F}\x{7F}\x{3}\x{FF}8\x{BA}\x{DC}\x{FE}0\x{CA}I\x{AB}\x{BD}8\x{EB}\x{CD}\x{BB}\x{FF}`(\x{17D}di*\x{C6} \x{AC}l\x{EB}\x{BE}p,\x{CF}tm\x{DF}x\x{AE}\x{EF}|\x{EF}\x{FF}\x{C0} pH,"
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 0e6c223..9dc51a3 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -69,6 +69,15 @@ V8 | KJS # LayoutTests/http/tests/xmlhttprequest/methods.html = FAIL
 // This class of test fails because of size differences in text runs.
 // Mostly this is because of international text rendering differences.
 
+// Bug 1316221: fail now that we use the same font code path in test_shell
+// as in Chrome
+V8 | KJS # DEFER : LayoutTests/css2.1/t1202-counter-04-b.html = FAIL
+V8 | KJS # DEFER : LayoutTests/css2.1/t1202-counters-04-b-diff-win.txt = FAIL
+
+// Bug 1316382: fails now that we use the same font code path in test_shell
+// as in Chrome: some characters that should have zero width don't
+V8 | KJS # DEFER : LayoutTests/fast/text/zero-width-characters.html = FAIL
+
 // Bug 1124513: the max length is being applied correctly, but the over- and
 // under-lines aren't placed properly over the "x".
 // The under-lines are a cosmetic error which is not necessary to fix for Beta. (eseidel)