Index: LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/wbr-expected.txt |
diff --git a/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/wbr-expected.txt b/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/wbr-expected.txt |
index d160788bc02a40a50779892d4ab225de2d7ff6fd..67d66460f3c365884683afdac594e286bac803a3 100644 |
--- a/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/wbr-expected.txt |
+++ b/LayoutTests/platform/mac/virtual/antialiasedtext/fast/text/wbr-expected.txt |
@@ -1,119 +1,119 @@ |
-layer at (0,0) size 800x600 scrollHeight 730 |
+layer at (0,0) size 800x600 scrollHeight 788 |
RenderView at (0,0) size 800x600 |
-layer at (0,0) size 800x730 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600 |
- RenderBlock {HTML} at (0,0) size 800x730 |
- RenderBody {BODY} at (8,8) size 784x712 |
- RenderBlock {P} at (0,0) size 784x16 |
- RenderText {#text} at (0,0) size 175x16 |
+layer at (0,0) size 800x788 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600 |
+ RenderBlock {HTML} at (0,0) size 800x788 |
+ RenderBody {BODY} at (8,8) size 784x770 |
+ RenderBlock {P} at (0,0) size 784x18 |
+ RenderText {#text} at (0,0) size 175x18 |
text run at (0,0) width 175: "Two words with no spaces." |
- RenderBlock {DIV} at (0,32) size 302x18 [border: (1px solid #0000FF)] |
- RenderText {#text} at (1,1) size 484x16 |
+ RenderBlock {DIV} at (0,34) size 302x20 [border: (1px solid #0000FF)] |
+ RenderText {#text} at (1,1) size 484x18 |
text run at (1,1) width 484: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" |
- LayoutTable {TABLE} at (0,60) size 784x18 |
- LayoutTableSection {TBODY} at (0,0) size 784x18 |
- LayoutTableRow {TR} at (0,0) size 784x18 |
- LayoutTableCell {TD} at (0,0) size 486x18 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (1,1) size 484x16 |
+ LayoutTable {TABLE} at (0,64) size 784x20 |
+ LayoutTableSection {TBODY} at (0,0) size 784x20 |
+ LayoutTableRow {TR} at (0,0) size 784x20 |
+ LayoutTableCell {TD} at (0,0) size 486x20 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (1,1) size 484x18 |
text run at (1,1) width 484: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" |
- LayoutTableCell {TD} at (486,9) size 298x0 [r=0 c=1 rs=1 cs=1] |
- RenderBlock {P} at (0,94) size 784x16 |
- RenderText {#text} at (0,0) size 189x16 |
+ LayoutTableCell {TD} at (486,10) size 298x0 [r=0 c=1 rs=1 cs=1] |
+ RenderBlock {P} at (0,100) size 784x18 |
+ RenderText {#text} at (0,0) size 189x18 |
text run at (0,0) width 189: "Using <wbr> to break words." |
- RenderBlock {DIV} at (0,126) size 302x34 [border: (1px solid #0000FF)] |
- RenderText {#text} at (1,1) size 228x16 |
+ RenderBlock {DIV} at (0,134) size 302x38 [border: (1px solid #0000FF)] |
+ RenderText {#text} at (1,1) size 228x18 |
text run at (1,1) width 228: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,17) size 256x16 |
- text run at (1,17) width 256: "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" |
- LayoutTable {TABLE} at (0,170) size 784x34 |
- LayoutTableSection {TBODY} at (0,0) size 784x34 |
- LayoutTableRow {TR} at (0,0) size 784x34 |
- LayoutTableCell {TD} at (0,0) size 258x34 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (1,1) size 228x16 |
+ RenderText {#text} at (1,19) size 256x18 |
+ text run at (1,19) width 256: "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" |
+ LayoutTable {TABLE} at (0,182) size 784x38 |
+ LayoutTableSection {TBODY} at (0,0) size 784x38 |
+ LayoutTableRow {TR} at (0,0) size 784x38 |
+ LayoutTableCell {TD} at (0,0) size 258x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (1,1) size 228x18 |
text run at (1,1) width 228: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,17) size 256x16 |
- text run at (1,17) width 256: "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" |
- LayoutTableCell {TD} at (258,17) size 526x0 [r=0 c=1 rs=1 cs=1] |
- RenderBlock {P} at (0,220) size 784x16 |
- RenderText {#text} at (0,0) size 285x16 |
+ RenderText {#text} at (1,19) size 256x18 |
+ text run at (1,19) width 256: "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" |
+ LayoutTableCell {TD} at (258,19) size 526x0 [r=0 c=1 rs=1 cs=1] |
+ RenderBlock {P} at (0,236) size 784x18 |
+ RenderText {#text} at (0,0) size 285x18 |
text run at (0,0) width 285: "Using <wbr> within <nobr> to break words." |
- RenderBlock {DIV} at (0,252) size 302x34 [border: (1px solid #0000FF)] |
- RenderInline {NOBR} at (0,0) size 256x32 |
- RenderText {#text} at (1,1) size 228x16 |
+ RenderBlock {DIV} at (0,270) size 302x38 [border: (1px solid #0000FF)] |
+ RenderInline {NOBR} at (0,0) size 256x36 |
+ RenderText {#text} at (1,1) size 228x18 |
text run at (1,1) width 228: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,17) size 256x16 |
- text run at (1,17) width 256: "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" |
- LayoutTable {TABLE} at (0,296) size 784x34 |
- LayoutTableSection {TBODY} at (0,0) size 784x34 |
- LayoutTableRow {TR} at (0,0) size 784x34 |
- LayoutTableCell {TD} at (0,0) size 258x34 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
- RenderInline {NOBR} at (0,0) size 256x32 |
- RenderText {#text} at (1,1) size 228x16 |
+ RenderText {#text} at (1,19) size 256x18 |
+ text run at (1,19) width 256: "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" |
+ LayoutTable {TABLE} at (0,318) size 784x38 |
+ LayoutTableSection {TBODY} at (0,0) size 784x38 |
+ LayoutTableRow {TR} at (0,0) size 784x38 |
+ LayoutTableCell {TD} at (0,0) size 258x38 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
+ RenderInline {NOBR} at (0,0) size 256x36 |
+ RenderText {#text} at (1,1) size 228x18 |
text run at (1,1) width 228: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,17) size 256x16 |
- text run at (1,17) width 256: "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" |
- LayoutTableCell {TD} at (258,17) size 526x0 [r=0 c=1 rs=1 cs=1] |
- RenderBlock {P} at (0,346) size 784x16 |
- RenderText {#text} at (0,0) size 225x16 |
+ RenderText {#text} at (1,19) size 256x18 |
+ text run at (1,19) width 256: "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" |
+ LayoutTableCell {TD} at (258,19) size 526x0 [r=0 c=1 rs=1 cs=1] |
+ RenderBlock {P} at (0,372) size 784x18 |
+ RenderText {#text} at (0,0) size 225x18 |
text run at (0,0) width 225: "Using <wbr> to break three words." |
- RenderBlock {DIV} at (0,378) size 302x50 [border: (1px solid #0000FF)] |
- RenderText {#text} at (1,1) size 171x16 |
+ RenderBlock {DIV} at (0,406) size 302x56 [border: (1px solid #0000FF)] |
+ RenderText {#text} at (1,1) size 171x18 |
text run at (1,1) width 171: "aaaaaaaaaaaaaaaaaaaaaaaa" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,17) size 192x16 |
- text run at (1,17) width 192: "bbbbbbbbbbbbbbbbbbbbbbbb" |
+ RenderText {#text} at (1,19) size 192x18 |
+ text run at (1,19) width 192: "bbbbbbbbbbbbbbbbbbbbbbbb" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,33) size 171x16 |
- text run at (1,33) width 171: "cccccccccccccccccccccccc" |
- LayoutTable {TABLE} at (0,438) size 784x50 |
- LayoutTableSection {TBODY} at (0,0) size 784x50 |
- LayoutTableRow {TR} at (0,0) size 784x50 |
- LayoutTableCell {TD} at (0,0) size 194x50 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (1,1) size 171x16 |
+ RenderText {#text} at (1,37) size 171x18 |
+ text run at (1,37) width 171: "cccccccccccccccccccccccc" |
+ LayoutTable {TABLE} at (0,472) size 784x56 |
+ LayoutTableSection {TBODY} at (0,0) size 784x56 |
+ LayoutTableRow {TR} at (0,0) size 784x56 |
+ LayoutTableCell {TD} at (0,0) size 194x56 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (1,1) size 171x18 |
text run at (1,1) width 171: "aaaaaaaaaaaaaaaaaaaaaaaa" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,17) size 192x16 |
- text run at (1,17) width 192: "bbbbbbbbbbbbbbbbbbbbbbbb" |
+ RenderText {#text} at (1,19) size 192x18 |
+ text run at (1,19) width 192: "bbbbbbbbbbbbbbbbbbbbbbbb" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,33) size 171x16 |
- text run at (1,33) width 171: "cccccccccccccccccccccccc" |
- LayoutTableCell {TD} at (194,25) size 590x0 [r=0 c=1 rs=1 cs=1] |
- RenderBlock {P} at (0,504) size 784x16 |
- RenderText {#text} at (0,0) size 321x16 |
+ RenderText {#text} at (1,37) size 171x18 |
+ text run at (1,37) width 171: "cccccccccccccccccccccccc" |
+ LayoutTableCell {TD} at (194,28) size 590x0 [r=0 c=1 rs=1 cs=1] |
+ RenderBlock {P} at (0,544) size 784x18 |
+ RenderText {#text} at (0,0) size 321x18 |
text run at (0,0) width 321: "Using <wbr> within <nobr> to break three words." |
- RenderBlock {DIV} at (0,536) size 302x50 [border: (1px solid #0000FF)] |
- RenderInline {NOBR} at (0,0) size 192x48 |
- RenderText {#text} at (1,1) size 171x16 |
+ RenderBlock {DIV} at (0,578) size 302x56 [border: (1px solid #0000FF)] |
+ RenderInline {NOBR} at (0,0) size 192x54 |
+ RenderText {#text} at (1,1) size 171x18 |
text run at (1,1) width 171: "aaaaaaaaaaaaaaaaaaaaaaaa" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,17) size 192x16 |
- text run at (1,17) width 192: "bbbbbbbbbbbbbbbbbbbbbbbb" |
+ RenderText {#text} at (1,19) size 192x18 |
+ text run at (1,19) width 192: "bbbbbbbbbbbbbbbbbbbbbbbb" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,33) size 171x16 |
- text run at (1,33) width 171: "cccccccccccccccccccccccc" |
- LayoutTable {TABLE} at (0,596) size 784x50 |
- LayoutTableSection {TBODY} at (0,0) size 784x50 |
- LayoutTableRow {TR} at (0,0) size 784x50 |
- LayoutTableCell {TD} at (0,0) size 194x50 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
- RenderInline {NOBR} at (0,0) size 192x48 |
- RenderText {#text} at (1,1) size 171x16 |
+ RenderText {#text} at (1,37) size 171x18 |
+ text run at (1,37) width 171: "cccccccccccccccccccccccc" |
+ LayoutTable {TABLE} at (0,644) size 784x56 |
+ LayoutTableSection {TBODY} at (0,0) size 784x56 |
+ LayoutTableRow {TR} at (0,0) size 784x56 |
+ LayoutTableCell {TD} at (0,0) size 194x56 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1] |
+ RenderInline {NOBR} at (0,0) size 192x54 |
+ RenderText {#text} at (1,1) size 171x18 |
text run at (1,1) width 171: "aaaaaaaaaaaaaaaaaaaaaaaa" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,17) size 192x16 |
- text run at (1,17) width 192: "bbbbbbbbbbbbbbbbbbbbbbbb" |
+ RenderText {#text} at (1,19) size 192x18 |
+ text run at (1,19) width 192: "bbbbbbbbbbbbbbbbbbbbbbbb" |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (1,33) size 171x16 |
- text run at (1,33) width 171: "cccccccccccccccccccccccc" |
- LayoutTableCell {TD} at (194,25) size 590x0 [r=0 c=1 rs=1 cs=1] |
- RenderBlock {P} at (0,662) size 784x16 |
- RenderText {#text} at (0,0) size 444x16 |
+ RenderText {#text} at (1,37) size 171x18 |
+ text run at (1,37) width 171: "cccccccccccccccccccccccc" |
+ LayoutTableCell {TD} at (194,28) size 590x0 [r=0 c=1 rs=1 cs=1] |
+ RenderBlock {P} at (0,716) size 784x18 |
+ RenderText {#text} at (0,0) size 444x18 |
text run at (0,0) width 444: "Spaces both before and after <wbr> to check for collapsing behavior." |
- RenderBlock {DIV} at (0,694) size 302x18 [border: (1px solid #0000FF)] |
- RenderText {#text} at (1,1) size 26x16 |
+ RenderBlock {DIV} at (0,750) size 302x20 [border: (1px solid #0000FF)] |
+ RenderText {#text} at (1,1) size 26x18 |
text run at (1,1) width 26: "aaa " |
RenderWordBreak {WBR} at (0,0) size 0x0 |
- RenderText {#text} at (26,1) size 25x16 |
+ RenderText {#text} at (26,1) size 25x18 |
text run at (26,1) width 25: "bbb" |