Modified: trunk/LayoutTests/platform/gtk/fast/text/international/003-expected.txt (147995 => 147996)
--- trunk/LayoutTests/platform/gtk/fast/text/international/003-expected.txt 2013-04-09 07:48:56 UTC (rev 147995)
+++ trunk/LayoutTests/platform/gtk/fast/text/international/003-expected.txt 2013-04-09 08:12:17 UTC (rev 147996)
@@ -3,94 +3,80 @@
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 784x324 [border: (5px outset #808080)]
- RenderTableSection {TBODY} at (5,5) size 774x314
- RenderTableRow {TR} at (0,2) size 774x310
- RenderTableCell {TD} at (2,155) size 716x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderTableCell {TD} at (720,2) size 52x310 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
- RenderInline {A} at (0,0) size 16x37 [color=#0000EE]
- RenderText {#text} at (2,2) size 16x37
- text run at (2,2) width 16: "\x{5CA1}"
- text run at (2,20) width 16: "\x{5C71}"
- RenderText {#text} at (18,20) size 16x19
- text run at (18,20) width 16: "\x{FF5C}"
+ RenderTable {TABLE} at (0,0) size 784x306 [border: (5px outset #808080)]
+ RenderTableSection {TBODY} at (5,5) size 774x296
+ RenderTableRow {TR} at (0,2) size 774x292
+ RenderTableCell {TD} at (2,146) size 716x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+ RenderTableCell {TD} at (720,2) size 52x292 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (2,2) size 32x19
+ text run at (2,2) width 32: "\x{5CA1}\x{5C71}"
+ RenderText {#text} at (34,2) size 16x19
+ text run at (34,2) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (2,20) size 32x19
+ text run at (2,20) width 32: "\x{5E83}\x{5CF6}"
+ RenderText {#text} at (34,20) size 16x19
+ text run at (34,20) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (2,38) size 32x19
+ text run at (2,38) width 32: "\x{5C71}\x{53E3}"
+ RenderText {#text} at (34,38) size 16x19
+ text run at (34,38) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (2,56) size 32x19
+ text run at (2,56) width 32: "\x{5FB3}\x{5CF6}"
+ RenderText {#text} at (34,56) size 16x19
+ text run at (34,56) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (2,74) size 32x19
+ text run at (2,74) width 32: "\x{9999}\x{5DDD}"
+ RenderText {#text} at (34,74) size 16x19
+ text run at (34,74) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (2,92) size 32x19
+ text run at (2,92) width 32: "\x{611B}\x{5A9B}"
+ RenderText {#text} at (34,92) size 16x19
+ text run at (34,92) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (2,110) size 32x19
+ text run at (2,110) width 32: "\x{9AD8}\x{77E5}"
+ RenderText {#text} at (34,110) size 16x19
+ text run at (34,110) width 16: "\x{FF5C}"
RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,20) size 48x37
- text run at (34,20) width 16: "\x{5E83}"
- text run at (2,38) width 16: "\x{5CF6}"
- RenderText {#text} at (18,38) size 16x19
- text run at (18,38) width 16: "\x{FF5C}"
+ RenderText {#text} at (2,128) size 48x37
+ text run at (2,128) width 48: "\x{798F}\x{5CA1}\x{30FB}"
+ text run at (2,146) width 48: "\x{5317}\x{4E5D}\x{5DDE}"
+ RenderText {#text} at (2,164) size 16x19
+ text run at (2,164) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (18,164) size 32x19
+ text run at (18,164) width 32: "\x{4F50}\x{8CC0}"
+ RenderText {#text} at (2,182) size 16x19
+ text run at (2,182) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (18,182) size 32x19
+ text run at (18,182) width 32: "\x{9577}\x{5D0E}"
+ RenderText {#text} at (2,200) size 16x19
+ text run at (2,200) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (18,200) size 32x19
+ text run at (18,200) width 32: "\x{718A}\x{672C}"
+ RenderText {#text} at (2,218) size 16x19
+ text run at (2,218) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (18,218) size 32x19
+ text run at (18,218) width 32: "\x{5927}\x{5206}"
+ RenderText {#text} at (2,236) size 16x19
+ text run at (2,236) width 16: "\x{FF5C}"
+ RenderInline {A} at (0,0) size 32x19 [color=#0000EE]
+ RenderText {#text} at (18,236) size 32x19
+ text run at (18,236) width 32: "\x{5BAE}\x{5D0E}"
+ RenderText {#text} at (2,254) size 16x19
+ text run at (2,254) width 16: "\x{FF5C}"
RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,38) size 48x37
- text run at (34,38) width 16: "\x{5C71}"
- text run at (2,56) width 16: "\x{53E3}"
- RenderText {#text} at (18,56) size 16x19
- text run at (18,56) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,56) size 48x37
- text run at (34,56) width 16: "\x{5FB3}"
- text run at (2,74) width 16: "\x{5CF6}"
- RenderText {#text} at (18,74) size 16x19
- text run at (18,74) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,74) size 48x37
- text run at (34,74) width 16: "\x{9999}"
- text run at (2,92) width 16: "\x{5DDD}"
- RenderText {#text} at (18,92) size 16x19
- text run at (18,92) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,92) size 48x37
- text run at (34,92) width 16: "\x{611B}"
- text run at (2,110) width 16: "\x{5A9B}"
- RenderText {#text} at (18,110) size 16x19
- text run at (18,110) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,110) size 48x37
- text run at (34,110) width 16: "\x{9AD8}"
- text run at (2,128) width 16: "\x{77E5}"
- RenderText {#text} at (18,128) size 16x19
- text run at (18,128) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x73 [color=#0000EE]
- RenderText {#text} at (34,128) size 48x73
- text run at (34,128) width 16: "\x{798F}"
- text run at (2,146) width 48: "\x{5CA1}\x{30FB}\x{5317}"
- text run at (2,164) width 16: "\x{4E5D}"
- text run at (2,182) width 16: "\x{5DDE}"
- RenderText {#text} at (18,182) size 16x19
- text run at (18,182) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,182) size 48x37
- text run at (34,182) width 16: "\x{4F50}"
- text run at (2,200) width 16: "\x{8CC0}"
- RenderText {#text} at (18,200) size 16x19
- text run at (18,200) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,200) size 48x37
- text run at (34,200) width 16: "\x{9577}"
- text run at (2,218) width 16: "\x{5D0E}"
- RenderText {#text} at (18,218) size 16x19
- text run at (18,218) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,218) size 48x37
- text run at (34,218) width 16: "\x{718A}"
- text run at (2,236) width 16: "\x{672C}"
- RenderText {#text} at (18,236) size 16x19
- text run at (18,236) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,236) size 48x37
- text run at (34,236) width 16: "\x{5927}"
- text run at (2,254) width 16: "\x{5206}"
- RenderText {#text} at (18,254) size 16x19
- text run at (18,254) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,254) size 48x37
- text run at (34,254) width 16: "\x{5BAE}"
- text run at (2,272) width 16: "\x{5D0E}"
+ RenderText {#text} at (18,254) size 48x37
+ text run at (18,254) width 32: "\x{9E7F}\x{5150}"
+ text run at (2,272) width 16: "\x{5CF6}"
RenderText {#text} at (18,272) size 16x19
text run at (18,272) width 16: "\x{FF5C}"
- RenderInline {A} at (0,0) size 48x37 [color=#0000EE]
- RenderText {#text} at (34,272) size 48x37
- text run at (34,272) width 16: "\x{9E7F}"
- text run at (2,290) width 32: "\x{5150}\x{5CF6}"
- RenderText {#text} at (34,290) size 16x19
- text run at (34,290) width 16: "\x{FF5C}"
Modified: trunk/LayoutTests/platform/gtk/fast/text/international/text-combine-image-test-expected.txt (147995 => 147996)
--- trunk/LayoutTests/platform/gtk/fast/text/international/text-combine-image-test-expected.txt 2013-04-09 07:48:56 UTC (rev 147995)
+++ trunk/LayoutTests/platform/gtk/fast/text/international/text-combine-image-test-expected.txt 2013-04-09 08:12:17 UTC (rev 147996)
@@ -98,7 +98,7 @@
RenderBlock (anonymous) at (265,0) size 219x584
RenderBlock {HR} at (0,0) size 2x584 [border: (1px inset #000000)]
RenderBlock {P} at (34,0) size 185x584
- RenderBlock (floating) {SPAN} at (0,309) size 30x275 [border: (1px solid #FF0000)]
+ RenderBlock (floating) {SPAN} at (0,309) size 58x275 [border: (1px solid #FF0000)]
RenderText {#text} at (1,1) size 28x105
text run at (1,1) width 105: "float:right:"
RenderInline {SPAN} at (0,0) size 28x48
@@ -112,17 +112,17 @@
RenderText {#text} at (1,202) size 28x24
text run at (1,202) width 24: "\x{6708}"
RenderInline {SPAN} at (0,0) size 28x24
- RenderCombineText {#text} at (1,226) size 28x24
- text run at (1,226) width 24: "\x{FFFC}"
- RenderText {#text} at (1,250) size 28x24
- text run at (1,250) width 24: "\x{65E5}"
+ RenderCombineText {#text} at (29,1) size 28x24
+ text run at (29,1) width 24: "\x{FFFC}"
+ RenderText {#text} at (29,25) size 28x24
+ text run at (29,25) width 24: "\x{65E5}"
RenderInline {SPAN} at (0,0) size 167x584
RenderText {#text} at (14,0) size 167x584
text run at (14,0) width 302: "\x{305D}\x{306E}\x{5973}\x{304C}\x{306D}\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}\x{3001}\x{308F}"
- text run at (51,0) width 572: "\x{305F}\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}"
- text run at (88,0) width 584: "\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}"
- text run at (125,0) width 572: "\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}"
- text run at (162,0) width 64: "\x{306B}\x{3044}\x{308B}\x{3002}"
+ text run at (51,0) width 288: "\x{305F}\x{3057}\x{306F}\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}"
+ text run at (88,0) width 572: "\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}"
+ text run at (125,0) width 584: "\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}"
+ text run at (162,0) width 348: "\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (516,0) size 0x584
RenderInline {SPAN} at (0,0) size 0x0