Index: LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/atsui-multiple-renderers-expected.txt |
diff --git a/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/atsui-multiple-renderers-expected.txt b/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/atsui-multiple-renderers-expected.txt |
index 1a48da7a188c590c80edbfa9cdfff4800da10700..143a910d85494a2da13a13e2f9e3614b36649ea1 100644 |
--- a/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/atsui-multiple-renderers-expected.txt |
+++ b/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/atsui-multiple-renderers-expected.txt |
@@ -3,98 +3,98 @@ 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 108x16 |
+ RenderBlock {P} at (0,0) size 784x36 |
+ RenderText {#text} at (0,0) size 108x18 |
text run at (0,0) width 108: "This is a test for " |
- RenderInline {I} at (0,0) size 769x32 |
- RenderText {#text} at (107,0) size 769x32 |
+ RenderInline {I} at (0,0) size 769x36 |
+ RenderText {#text} at (107,0) size 769x36 |
text run at (107,0) width 662: "http://bugzilla.opendarwin.org/show_bug.cgi?id=6139 ATSUI code path should implement small caps," |
- text run at (0,16) width 412: "synthetic bold and oblique and correct metrics for fallback fonts" |
- RenderText {#text} at (411,16) size 5x16 |
- text run at (411,16) width 5: "." |
- RenderBlock {HR} at (0,48) size 784x2 [border: (1px inset #EEEEEE)] |
- RenderBlock {P} at (0,66) size 784x16 |
- RenderText {#text} at (0,0) size 611x16 |
+ text run at (0,18) width 412: "synthetic bold and oblique and correct metrics for fallback fonts" |
+ RenderText {#text} at (411,18) size 5x18 |
+ text run at (411,18) width 5: "." |
+ RenderBlock {HR} at (0,52) size 784x2 [border: (1px inset #EEEEEE)] |
+ RenderBlock {P} at (0,70) size 784x18 |
+ RenderText {#text} at (0,0) size 611x18 |
text run at (0,0) width 611: "The two columns should be identical except for the accent over the e and the umlaut over the u." |
- LayoutTable {TABLE} at (0,98) size 264x144 [border: none] |
- LayoutTableSection {TBODY} at (0,0) size 263x143 |
+ LayoutTable {TABLE} at (0,104) size 264x147 [border: none] |
+ LayoutTableSection {TBODY} at (0,0) size 263x146 |
LayoutTableRow {TR} at (0,0) size 263x30 |
LayoutTableCell {TD} at (0,0) size 140x30 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
RenderText {#text} at (2,3) size 68x25 |
text run at (2,3) width 68: "Lore\x{300}m " |
- RenderInline {SPAN} at (0,0) size 50x20 |
- RenderText {#text} at (69,8) size 50x20 |
- text run at (69,8) width 50: "ipsu\x{308}m" |
+ RenderInline {SPAN} at (0,0) size 50x23 |
+ RenderText {#text} at (69,5) size 50x23 |
+ text run at (69,5) width 50: "ipsu\x{308}m" |
RenderText {#text} at (0,0) size 0x0 |
LayoutTableCell {TD} at (140,0) size 123x30 [border: (1px solid #008000)] [r=0 c=1 rs=1 cs=1] |
RenderText {#text} at (2,3) size 68x25 |
text run at (2,3) width 68: "Lorem " |
- RenderInline {SPAN} at (0,0) size 50x20 |
- RenderText {#text} at (69,8) size 50x20 |
- text run at (69,8) width 50: "ipsum" |
+ RenderInline {SPAN} at (0,0) size 50x23 |
+ RenderText {#text} at (69,5) size 50x23 |
+ text run at (69,5) width 50: "ipsum" |
RenderText {#text} at (0,0) size 0x0 |
LayoutTableRow {TR} at (0,30) size 263x30 |
LayoutTableCell {TD} at (0,30) size 140x30 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1] |
RenderText {#text} at (2,3) size 68x25 |
text run at (2,3) width 68: "Lore\x{300}m " |
- RenderInline {SPAN} at (0,0) size 53x20 |
- RenderText {#text} at (69,8) size 53x20 |
- text run at (69,8) width 53: "ipsu\x{308}m" |
+ RenderInline {SPAN} at (0,0) size 53x23 |
+ RenderText {#text} at (69,5) size 53x23 |
+ text run at (69,5) width 53: "ipsu\x{308}m" |
RenderText {#text} at (0,0) size 0x0 |
LayoutTableCell {TD} at (140,30) size 123x30 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1] |
RenderText {#text} at (2,3) size 68x25 |
text run at (2,3) width 68: "Lorem " |
- RenderInline {SPAN} at (0,0) size 53x20 |
- RenderText {#text} at (69,8) size 53x20 |
- text run at (69,8) width 53: "ipsum" |
+ RenderInline {SPAN} at (0,0) size 53x23 |
+ RenderText {#text} at (69,5) size 53x23 |
+ text run at (69,5) width 53: "ipsum" |
RenderText {#text} at (0,0) size 0x0 |
LayoutTableRow {TR} at (0,60) size 263x30 |
LayoutTableCell {TD} at (0,60) size 140x30 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1] |
RenderText {#text} at (2,3) size 68x25 |
text run at (2,3) width 68: "Lore\x{300}m " |
- RenderInline {SPAN} at (0,0) size 49x20 |
- RenderText {#text} at (69,8) size 49x20 |
- text run at (69,8) width 49: "ipsu\x{308}m" |
+ RenderInline {SPAN} at (0,0) size 49x23 |
+ RenderText {#text} at (69,5) size 49x23 |
+ text run at (69,5) width 49: "ipsu\x{308}m" |
RenderText {#text} at (0,0) size 0x0 |
LayoutTableCell {TD} at (140,60) size 123x30 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1] |
RenderText {#text} at (2,3) size 68x25 |
text run at (2,3) width 68: "Lorem " |
- RenderInline {SPAN} at (0,0) size 49x20 |
- RenderText {#text} at (69,8) size 49x20 |
- text run at (69,8) width 49: "ipsum" |
+ RenderInline {SPAN} at (0,0) size 49x23 |
+ RenderText {#text} at (69,5) size 49x23 |
+ text run at (69,5) width 49: "ipsum" |
RenderText {#text} at (0,0) size 0x0 |
LayoutTableRow {TR} at (0,90) size 263x30 |
LayoutTableCell {TD} at (0,90) size 140x30 [border: (1px solid #008000)] [r=3 c=0 rs=1 cs=1] |
RenderText {#text} at (2,3) size 68x25 |
text run at (2,3) width 68: "Lore\x{300}m " |
- RenderInline {SPAN} at (0,0) size 51x20 |
- RenderText {#text} at (69,8) size 51x20 |
- text run at (69,8) width 51: "ipsu\x{308}m" |
+ RenderInline {SPAN} at (0,0) size 51x23 |
+ RenderText {#text} at (69,5) size 51x23 |
+ text run at (69,5) width 51: "ipsu\x{308}m" |
RenderText {#text} at (0,0) size 0x0 |
LayoutTableCell {TD} at (140,90) size 123x30 [border: (1px solid #008000)] [r=3 c=1 rs=1 cs=1] |
RenderText {#text} at (2,3) size 68x25 |
text run at (2,3) width 68: "Lorem " |
- RenderInline {SPAN} at (0,0) size 51x20 |
- RenderText {#text} at (69,8) size 51x20 |
- text run at (69,8) width 51: "ipsum" |
+ RenderInline {SPAN} at (0,0) size 51x23 |
+ RenderText {#text} at (69,5) size 51x23 |
+ text run at (69,5) width 51: "ipsum" |
RenderText {#text} at (0,0) size 0x0 |
- LayoutTableRow {TR} at (0,120) size 263x23 |
- LayoutTableCell {TD} at (0,120) size 140x23 [border: (1px solid #008000)] [r=4 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 137x20 |
+ LayoutTableRow {TR} at (0,120) size 263x26 |
+ LayoutTableCell {TD} at (0,120) size 140x26 [border: (1px solid #008000)] [r=4 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 137x23 |
text run at (2,2) width 137: "Lore\x{300}m ipsu\x{308}m" |
- LayoutTableCell {TD} at (140,120) size 123x23 [border: (1px solid #008000)] [r=4 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 101x20 |
+ LayoutTableCell {TD} at (140,120) size 123x26 [border: (1px solid #008000)] [r=4 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 101x23 |
text run at (2,2) width 101: "Lorem ipsum" |
- RenderBlock {HR} at (0,250) size 784x2 [border: (1px inset #EEEEEE)] |
- RenderBlock {P} at (0,268) size 784x16 |
- RenderText {#text} at (0,0) size 283x16 |
+ RenderBlock {HR} at (0,259) size 784x2 [border: (1px inset #EEEEEE)] |
+ RenderBlock {P} at (0,277) size 784x18 |
+ RenderText {#text} at (0,0) size 283x18 |
text run at (0,0) width 283: "The following two lines should be identical." |
- RenderBlock {P} at (0,300) size 784x24 |
- RenderInline {SPAN} at (0,0) size 337x21 [border: (1px solid #008000)] |
- RenderText {#text} at (1,5) size 335x19 |
- text run at (1,5) width 335: "\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}" |
+ RenderBlock {P} at (0,311) size 784x24 |
+ RenderInline {SPAN} at (0,0) size 337x24 [border: (1px solid #008000)] |
+ RenderText {#text} at (1,2) size 335x22 |
+ text run at (1,2) width 335: "\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}" |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,340) size 784x24 |
+ RenderBlock {P} at (0,351) size 784x24 |
RenderInline {SPAN} at (0,0) size 337x23 [border: (1px solid #008000)] |
RenderText {#text} at (1,2) size 335x21 |
text run at (1,2) width 335: "\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}\x{E01}\x{E02}\x{E03}\x{E04}\x{E05}\x{E06}\x{E07}\x{E08}" |