Index: LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/softHyphen-expected.txt |
diff --git a/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/softHyphen-expected.txt b/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/softHyphen-expected.txt |
index 1c2ca7f310042d16dead2a3e45d924b16b210f20..476b591fa30216e3aba51d64855ea52ad1e48a6f 100644 |
--- a/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/softHyphen-expected.txt |
+++ b/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/softHyphen-expected.txt |
@@ -1,168 +1,168 @@ |
-layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 934 |
+layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 992 |
RenderView at (0,0) size 800x600 |
-layer at (0,0) size 785x934 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
- RenderBlock {HTML} at (0,0) size 785x934 |
- RenderBody {BODY} at (8,16) size 769x902 |
- RenderBlock {P} at (0,0) size 769x16 |
- RenderText {#text} at (0,0) size 438x16 |
+layer at (0,0) size 785x992 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
+ RenderBlock {HTML} at (0,0) size 785x992 |
+ RenderBody {BODY} at (8,16) size 769x960 |
+ RenderBlock {P} at (0,0) size 769x18 |
+ RenderText {#text} at (0,0) size 438x18 |
text run at (0,0) width 438: "In all of the following, there should not be a hyphen before \x{201C}lorem\x{201D}." |
- RenderBlock {P} at (0,32) size 769x16 |
- RenderText {#text} at (0,0) size 20x16 |
+ RenderBlock {P} at (0,34) size 769x18 |
+ RenderText {#text} at (0,0) size 20x18 |
text run at (0,0) width 20: "Do" |
- RenderBlock (floating) {SPAN} at (755.45,0) size 13.55x18 [border: (1px solid #FF0000)] |
- RenderText {#text} at (1,1) size 12x16 |
+ RenderBlock (floating) {SPAN} at (755.45,0) size 13.55x20 [border: (1px solid #FF0000)] |
+ RenderText {#text} at (1,1) size 12x18 |
text run at (1,1) width 12: "X" |
- RenderText {#text} at (19,0) size 81x16 |
+ RenderText {#text} at (19,0) size 81x18 |
text run at (19,0) width 81: "\x{AD}lorem ipsum" |
- RenderBlock {P} at (0,64) size 769x16 |
- RenderBlock (floating) {SPAN} at (755.45,0) size 13.55x18 [border: (1px solid #FF0000)] |
- RenderText {#text} at (1,1) size 12x16 |
+ RenderBlock {P} at (0,68) size 769x18 |
+ RenderBlock (floating) {SPAN} at (755.45,0) size 13.55x20 [border: (1px solid #FF0000)] |
+ RenderText {#text} at (1,1) size 12x18 |
text run at (1,1) width 12: "X" |
- RenderText {#text} at (0,0) size 81x16 |
+ RenderText {#text} at (0,0) size 81x18 |
text run at (0,0) width 81: "lorem ipsum" |
- RenderBlock {P} at (0,96) size 769x18 |
- RenderText {#text} at (0,1) size 20x16 |
+ RenderBlock {P} at (0,102) size 769x20 |
+ RenderText {#text} at (0,1) size 20x18 |
text run at (0,1) width 20: "Do" |
- RenderText {#text} at (33,1) size 81x16 |
+ RenderText {#text} at (33,1) size 81x18 |
text run at (33,1) width 81: "\x{AD}lorem ipsum" |
- RenderBlock {P} at (0,130) size 769x16 |
- RenderText {#text} at (0,0) size 20x16 |
+ RenderBlock {P} at (0,138) size 769x18 |
+ RenderText {#text} at (0,0) size 20x18 |
text run at (0,0) width 20: "Do" |
- RenderText {#text} at (19,0) size 81x16 |
+ RenderText {#text} at (19,0) size 81x18 |
text run at (19,0) width 81: "\x{AD}lorem ipsum" |
- RenderBlock (anonymous) at (0,162) size 769x16 |
- RenderText {#text} at (0,0) size 20x16 |
+ RenderBlock (anonymous) at (0,172) size 769x18 |
+ RenderText {#text} at (0,0) size 20x18 |
text run at (0,0) width 20: "Do" |
- RenderBlock {P} at (0,194) size 769x16 |
- RenderText {#text} at (0,0) size 81x16 |
+ RenderBlock {P} at (0,206) size 769x18 |
+ RenderText {#text} at (0,0) size 81x18 |
text run at (0,0) width 81: "lorem ipsum" |
- RenderBlock {P} at (0,226) size 769x32 |
- RenderText {#text} at (0,0) size 20x16 |
+ RenderBlock {P} at (0,240) size 769x36 |
+ RenderText {#text} at (0,0) size 20x18 |
text run at (0,0) width 20: "Do" |
- RenderBR {BR} at (19,12) size 1x0 |
- RenderText {#text} at (0,16) size 81x16 |
- text run at (0,16) width 81: "lorem ipsum" |
- RenderBlock {P} at (0,274) size 769x16 |
- RenderText {#text} at (0,0) size 20x16 |
+ RenderBR {BR} at (19,14) size 1x0 |
+ RenderText {#text} at (0,18) size 81x18 |
+ text run at (0,18) width 81: "lorem ipsum" |
+ RenderBlock {P} at (0,292) size 769x18 |
+ RenderText {#text} at (0,0) size 20x18 |
text run at (0,0) width 20: "Do" |
- RenderInline {SPAN} at (0,0) size 38x16 |
- RenderText {#text} at (19,0) size 38x16 |
+ RenderInline {SPAN} at (0,0) size 38x18 |
+ RenderText {#text} at (19,0) size 38x18 |
text run at (19,0) width 38: "\x{AD}lorem" |
- RenderText {#text} at (56,0) size 44x16 |
+ RenderText {#text} at (56,0) size 44x18 |
text run at (56,0) width 44: " ipsum" |
- RenderBlock {P} at (0,306) size 769x16 |
- RenderText {#text} at (0,0) size 12x16 |
+ RenderBlock {P} at (0,326) size 769x18 |
+ RenderText {#text} at (0,0) size 12x18 |
text run at (0,0) width 12: "D" |
- RenderInline {SPAN} at (0,0) size 9x16 |
- RenderText {#text} at (11,0) size 9x16 |
+ RenderInline {SPAN} at (0,0) size 9x18 |
+ RenderText {#text} at (11,0) size 9x18 |
text run at (11,0) width 9: "o" |
- RenderText {#text} at (19,0) size 81x16 |
+ RenderText {#text} at (19,0) size 81x18 |
text run at (19,0) width 81: "\x{AD}lorem ipsum" |
- RenderBlock {P} at (0,338) size 769x16 |
- RenderText {#text} at (0,0) size 24x16 |
+ RenderBlock {P} at (0,360) size 769x18 |
+ RenderText {#text} at (0,0) size 24x18 |
text run at (0,0) width 24: "Do " |
- RenderInline {SPAN} at (0,0) size 38x16 |
- RenderText {#text} at (23,0) size 38x16 |
+ RenderInline {SPAN} at (0,0) size 38x18 |
+ RenderText {#text} at (23,0) size 38x18 |
text run at (23,0) width 38: "\x{AD}lorem" |
- RenderText {#text} at (60,0) size 44x16 |
+ RenderText {#text} at (60,0) size 44x18 |
text run at (60,0) width 44: " ipsum" |
- RenderBlock {P} at (0,370) size 769x16 |
- RenderText {#text} at (0,0) size 12x16 |
+ RenderBlock {P} at (0,394) size 769x18 |
+ RenderText {#text} at (0,0) size 12x18 |
text run at (0,0) width 12: "D" |
- RenderInline {SPAN} at (0,0) size 13x16 |
- RenderText {#text} at (11,0) size 13x16 |
+ RenderInline {SPAN} at (0,0) size 13x18 |
+ RenderText {#text} at (11,0) size 13x18 |
text run at (11,0) width 13: "o " |
- RenderText {#text} at (23,0) size 81x16 |
+ RenderText {#text} at (23,0) size 81x18 |
text run at (23,0) width 81: "\x{AD}lorem ipsum" |
- RenderBlock {P} at (0,402) size 769x16 |
- RenderText {#text} at (0,0) size 24x16 |
+ RenderBlock {P} at (0,428) size 769x18 |
+ RenderText {#text} at (0,0) size 24x18 |
text run at (0,0) width 24: "Do " |
- RenderInline {SPAN} at (0,0) size 38x16 |
- RenderText {#text} at (23,0) size 38x16 |
+ RenderInline {SPAN} at (0,0) size 38x18 |
+ RenderText {#text} at (23,0) size 38x18 |
text run at (23,0) width 38: "\x{AD}lorem" |
- RenderText {#text} at (60,0) size 44x16 |
+ RenderText {#text} at (60,0) size 44x18 |
text run at (60,0) width 44: " ipsum" |
- RenderBlock {P} at (0,434) size 769x16 |
- RenderText {#text} at (0,0) size 12x16 |
+ RenderBlock {P} at (0,462) size 769x18 |
+ RenderText {#text} at (0,0) size 12x18 |
text run at (0,0) width 12: "D" |
- RenderInline {SPAN} at (0,0) size 13x16 |
- RenderText {#text} at (11,0) size 13x16 |
+ RenderInline {SPAN} at (0,0) size 13x18 |
+ RenderText {#text} at (11,0) size 13x18 |
text run at (11,0) width 13: "o " |
- RenderText {#text} at (23,0) size 81x16 |
+ RenderText {#text} at (23,0) size 81x18 |
text run at (23,0) width 81: "\x{AD}lorem ipsum" |
- RenderBlock {P} at (0,466) size 769x16 |
- RenderText {#text} at (0,0) size 65x16 |
+ RenderBlock {P} at (0,496) size 769x18 |
+ RenderText {#text} at (0,0) size 65x18 |
text run at (0,0) width 65: "Do \x{AD} lorem" |
- RenderBlock {P} at (0,498) size 769x16 |
- RenderText {#text} at (0,0) size 61x16 |
+ RenderBlock {P} at (0,530) size 769x18 |
+ RenderText {#text} at (0,0) size 61x18 |
text run at (0,0) width 61: "Do\x{AD} \x{AD}lorem" |
- RenderBlock {P} at (0,530) size 769x16 |
- RenderText {#text} at (0,0) size 61x16 |
+ RenderBlock {P} at (0,564) size 769x18 |
+ RenderText {#text} at (0,0) size 61x18 |
text run at (0,0) width 24: "Do " |
text run at (23,0) width 38: "\x{AD}lorem" |
- RenderBlock {P} at (0,562) size 769x16 |
- RenderText {#text} at (0,0) size 61x16 |
+ RenderBlock {P} at (0,598) size 769x18 |
+ RenderText {#text} at (0,0) size 61x18 |
text run at (0,0) width 24: "Do\x{AD} " |
text run at (23,0) width 38: "lorem" |
- RenderBlock {P} at (0,594) size 769x16 |
- RenderText {#text} at (0,0) size 65x16 |
+ RenderBlock {P} at (0,632) size 769x18 |
+ RenderText {#text} at (0,0) size 65x18 |
text run at (0,0) width 28: "Do \x{AD} " |
text run at (27,0) width 38: "lorem" |
- RenderBlock {P} at (0,626) size 769x16 |
- RenderText {#text} at (0,0) size 65x16 |
+ RenderBlock {P} at (0,666) size 769x18 |
+ RenderText {#text} at (0,0) size 65x18 |
text run at (0,0) width 24: "Do " |
text run at (23,0) width 42: "\x{AD} lorem" |
- RenderBlock {P} at (0,658) size 769x16 |
- RenderText {#text} at (0,0) size 20x16 |
+ RenderBlock {P} at (0,700) size 769x18 |
+ RenderText {#text} at (0,0) size 20x18 |
text run at (0,0) width 20: "Do" |
- RenderInline {SPAN} at (0,0) size 1x16 |
- RenderText {#text} at (19,0) size 81x16 |
+ RenderInline {SPAN} at (0,0) size 1x18 |
+ RenderText {#text} at (19,0) size 81x18 |
text run at (19,0) width 81: "\x{AD}lorem ipsum" |
- RenderBlock {P} at (0,690) size 769x16 |
- RenderText {#text} at (0,0) size 100x16 |
+ RenderBlock {P} at (0,734) size 769x18 |
+ RenderText {#text} at (0,0) size 100x18 |
text run at (0,0) width 100: "Do\x{AD}\x{AD}lorem ipsum" |
- RenderBlock {P} at (0,722) size 769x16 |
- RenderInline {SPAN} at (0,0) size 20x16 |
- RenderText {#text} at (0,0) size 20x16 |
+ RenderBlock {P} at (0,768) size 769x18 |
+ RenderInline {SPAN} at (0,0) size 20x18 |
+ RenderText {#text} at (0,0) size 20x18 |
text run at (0,0) width 20: "Do\x{AD}" |
- RenderText {#text} at (19,0) size 81x16 |
+ RenderText {#text} at (19,0) size 81x18 |
text run at (19,0) width 81: "\x{AD}lorem ipsum" |
- RenderBlock {P} at (0,754) size 769x16 |
- RenderText {#text} at (0,0) size 20x16 |
+ RenderBlock {P} at (0,802) size 769x18 |
+ RenderText {#text} at (0,0) size 20x18 |
text run at (0,0) width 20: "Do\x{AD}" |
- RenderInline {SPAN} at (0,0) size 81x16 |
- RenderText {#text} at (19,0) size 81x16 |
+ RenderInline {SPAN} at (0,0) size 81x18 |
+ RenderText {#text} at (19,0) size 81x18 |
text run at (19,0) width 81: "\x{AD}lorem ipsum" |
- RenderBlock {P} at (0,786) size 769x16 |
- RenderInline {SPAN} at (0,0) size 20x16 |
- RenderText {#text} at (0,0) size 20x16 |
+ RenderBlock {P} at (0,836) size 769x18 |
+ RenderInline {SPAN} at (0,0) size 20x18 |
+ RenderText {#text} at (0,0) size 20x18 |
text run at (0,0) width 20: "Do\x{AD}\x{AD}" |
- RenderText {#text} at (19,0) size 81x16 |
+ RenderText {#text} at (19,0) size 81x18 |
text run at (19,0) width 81: "lorem ipsum" |
- RenderBlock {P} at (0,818) size 769x16 |
- RenderText {#text} at (0,0) size 251x16 |
+ RenderBlock {P} at (0,870) size 769x18 |
+ RenderText {#text} at (0,0) size 251x18 |
text run at (0,0) width 251: "The following pair should be the same:" |
- RenderBlock {P} at (0,850) size 769x18 |
- RenderText {#text} at (0,1) size 16x16 |
+ RenderBlock {P} at (0,904) size 769x20 |
+ RenderText {#text} at (0,1) size 16x18 |
text run at (0,1) width 16: "W" |
- RenderBlock {SPAN} at (15.09,0) size 13.55x18 [border: (1px solid #FF0000)] |
- RenderText {#text} at (1,1) size 12x16 |
+ RenderBlock {SPAN} at (15.09,0) size 13.55x20 [border: (1px solid #FF0000)] |
+ RenderText {#text} at (1,1) size 12x18 |
text run at (1,1) width 12: "X" |
- RenderText {#text} at (28,1) size 13x16 |
+ RenderText {#text} at (28,1) size 13x18 |
text run at (28,1) width 13: "Y" |
- RenderBlock {P} at (0,884) size 769x18 |
- RenderText {#text} at (0,1) size 16x16 |
+ RenderBlock {P} at (0,940) size 769x20 |
+ RenderText {#text} at (0,1) size 16x18 |
text run at (0,1) width 16: "W" |
- RenderBlock {SPAN} at (15.09,0) size 13.55x18 [border: (1px solid #FF0000)] |
- RenderText {#text} at (1,1) size 12x16 |
+ RenderBlock {SPAN} at (15.09,0) size 13.55x20 [border: (1px solid #FF0000)] |
+ RenderText {#text} at (1,1) size 12x18 |
text run at (1,1) width 12: "X" |
- RenderText {#text} at (28,1) size 13x16 |
+ RenderText {#text} at (28,1) size 13x18 |
text run at (28,1) width 13: "Y" |
-layer at (28,112) size 13x18 |
- RenderBlock (relative positioned) {SPAN} at (19.55,0) size 13.55x18 [border: (1px solid #FF0000)] |
- RenderText {#text} at (1,1) size 12x16 |
+layer at (28,118) size 13x20 |
+ RenderBlock (relative positioned) {SPAN} at (19.55,0) size 13.55x20 [border: (1px solid #FF0000)] |
+ RenderText {#text} at (1,1) size 12x18 |
text run at (1,1) width 12: "X" |
-layer at (771,146) size 14x18 |
- RenderBlock (positioned) {SPAN} at (771.45,146) size 13.55x18 [border: (1px solid #FF0000)] |
- RenderText {#text} at (1,1) size 12x16 |
+layer at (771,154) size 14x20 |
+ RenderBlock (positioned) {SPAN} at (771.45,154) size 13.55x20 [border: (1px solid #FF0000)] |
+ RenderText {#text} at (1,1) size 12x18 |
text run at (1,1) width 12: "X" |