| Index: LayoutTests/platform/mac/css1/formatting_model/height_of_lines-expected.txt
|
| diff --git a/LayoutTests/platform/mac/css1/formatting_model/height_of_lines-expected.txt b/LayoutTests/platform/mac/css1/formatting_model/height_of_lines-expected.txt
|
| index a732e5ca37f68f798b3088884340e1afd6caf4f8..5a05d7d7397fd6098417e67766a9e9b9608b9505 100644
|
| --- a/LayoutTests/platform/mac/css1/formatting_model/height_of_lines-expected.txt
|
| +++ b/LayoutTests/platform/mac/css1/formatting_model/height_of_lines-expected.txt
|
| @@ -1,132 +1,132 @@
|
| -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2267
|
| +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2299
|
| RenderView at (0,0) size 800x600
|
| -layer at (0,0) size 785x2267 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| - RenderBlock {HTML} at (0,0) size 785x2267
|
| - RenderBody {BODY} at (8,8) size 769x2251 [bgcolor=#CCCCCC]
|
| - RenderBlock {P} at (0,0) size 769x16
|
| - RenderText {#text} at (0,0) size 363x16
|
| +layer at (0,0) size 785x2299 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| + RenderBlock {HTML} at (0,0) size 785x2299
|
| + RenderBody {BODY} at (8,8) size 769x2283 [bgcolor=#CCCCCC]
|
| + RenderBlock {P} at (0,0) size 769x18
|
| + RenderText {#text} at (0,0) size 363x18
|
| text run at (0,0) width 363: "The style declarations which apply to the text below are:"
|
| - RenderBlock {PRE} at (0,32) size 769x234
|
| - RenderText {#text} at (0,0) size 523x234
|
| + RenderBlock {PRE} at (0,34) size 769x270
|
| + RenderText {#text} at (0,0) size 523x270
|
| text run at (0,0) width 336: "P.one {font-size: 14px; line-height: 20px;}"
|
| text run at (335,0) width 1: " "
|
| - text run at (0,13) width 297: "IMG.onea {vertical-align: text-bottom;"
|
| - text run at (296,13) width 1: " "
|
| - text run at (0,26) width 266: " width: 200px; height: 200px;}"
|
| - text run at (265,26) width 1: " "
|
| - text run at (0,39) width 508: "IMG.oneb {vertical-align: text-top; width: 200px; height: 200px;}"
|
| - text run at (507,39) width 1: " "
|
| - text run at (0,52) width 0: " "
|
| - text run at (0,65) width 336: "P.two {font-size: 14px; line-height: 20px;}"
|
| - text run at (335,65) width 1: " "
|
| - text run at (0,78) width 523: "IMG.twoa {vertical-align: text-bottom; width: 100px; height: 100px;"
|
| - text run at (522,78) width 1: " "
|
| - text run at (0,91) width 305: " padding: 5px; border-style: solid;"
|
| - text run at (304,91) width 1: " "
|
| - text run at (0,104) width 305: " border-width: 10px; margin: 15px;}"
|
| - text run at (304,104) width 1: " "
|
| - text run at (0,117) width 274: "IMG.twob {vertical-align: text-top;"
|
| - text run at (273,117) width 1: " "
|
| - text run at (0,130) width 297: " width: 100px; height: 100px;"
|
| - text run at (296,130) width 1: " "
|
| - text run at (0,143) width 305: " padding: 5px; border-style: solid;"
|
| - text run at (304,143) width 1: " "
|
| - text run at (0,156) width 305: " border-width: 10px; margin: 15px;}"
|
| - text run at (304,156) width 1: " "
|
| - text run at (0,169) width 0: " "
|
| - text run at (0,182) width 469: "IMG.twoc {vertical-align: middle; width: 50px; height: 50px;"
|
| - text run at (468,182) width 1: " "
|
| - text run at (0,195) width 305: " padding: 5px; border-style: solid;"
|
| - text run at (304,195) width 1: " "
|
| - text run at (0,208) width 313: " border-width: 10px; margin: -10px;}"
|
| - text run at (312,208) width 1: " "
|
| - text run at (0,221) width 0: " "
|
| - RenderBlock {HR} at (0,279) size 769x2 [border: (1px inset #EEEEEE)]
|
| - RenderBlock {P} at (0,295) size 769x445
|
| - RenderText {#text} at (0,2) size 768x238
|
| - text run at (0,2) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
|
| - text run at (412,2) width 345: "This means that the lines of text within it should be separated"
|
| - text run at (0,22) width 367: "by six pixels, three of which are part of the line-box of each line. "
|
| - text run at (366,22) width 402: "Any images within the paragraph should increase the height of the line-"
|
| - text run at (0,225) width 266: "box so that they fit within the line box, such as "
|
| + text run at (0,15) width 297: "IMG.onea {vertical-align: text-bottom;"
|
| + text run at (296,15) width 1: " "
|
| + text run at (0,30) width 266: " width: 200px; height: 200px;}"
|
| + text run at (265,30) width 1: " "
|
| + text run at (0,45) width 508: "IMG.oneb {vertical-align: text-top; width: 200px; height: 200px;}"
|
| + text run at (507,45) width 1: " "
|
| + text run at (0,60) width 0: " "
|
| + text run at (0,75) width 336: "P.two {font-size: 14px; line-height: 20px;}"
|
| + text run at (335,75) width 1: " "
|
| + text run at (0,90) width 523: "IMG.twoa {vertical-align: text-bottom; width: 100px; height: 100px;"
|
| + text run at (522,90) width 1: " "
|
| + text run at (0,105) width 305: " padding: 5px; border-style: solid;"
|
| + text run at (304,105) width 1: " "
|
| + text run at (0,120) width 305: " border-width: 10px; margin: 15px;}"
|
| + text run at (304,120) width 1: " "
|
| + text run at (0,135) width 274: "IMG.twob {vertical-align: text-top;"
|
| + text run at (273,135) width 1: " "
|
| + text run at (0,150) width 297: " width: 100px; height: 100px;"
|
| + text run at (296,150) width 1: " "
|
| + text run at (0,165) width 305: " padding: 5px; border-style: solid;"
|
| + text run at (304,165) width 1: " "
|
| + text run at (0,180) width 305: " border-width: 10px; margin: 15px;}"
|
| + text run at (304,180) width 1: " "
|
| + text run at (0,195) width 0: " "
|
| + text run at (0,210) width 469: "IMG.twoc {vertical-align: middle; width: 50px; height: 50px;"
|
| + text run at (468,210) width 1: " "
|
| + text run at (0,225) width 305: " padding: 5px; border-style: solid;"
|
| + text run at (304,225) width 1: " "
|
| + text run at (0,240) width 313: " border-width: 10px; margin: -10px;}"
|
| + text run at (312,240) width 1: " "
|
| + text run at (0,255) width 0: " "
|
| + RenderBlock {HR} at (0,317) size 769x2 [border: (1px inset #EEEEEE)]
|
| + RenderBlock {P} at (0,333) size 769x443
|
| + RenderText {#text} at (0,1) size 768x239
|
| + text run at (0,1) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
|
| + text run at (412,1) width 345: "This means that the lines of text within it should be separated"
|
| + text run at (0,21) width 367: "by six pixels, three of which are part of the line-box of each line. "
|
| + text run at (366,21) width 402: "Any images within the paragraph should increase the height of the line-"
|
| + text run at (0,223) width 266: "box so that they fit within the line box, such as "
|
| RenderImage {IMG} at (265.17,40) size 200x200
|
| - RenderText {#text} at (465,225) size 28x15
|
| - text run at (465,225) width 28: " and "
|
| - RenderImage {IMG} at (492.39,225) size 200x200
|
| - RenderText {#text} at (692,225) size 769x217
|
| - text run at (692,225) width 8: ". "
|
| - text run at (699,225) width 39: "This is"
|
| - text run at (0,427) width 769: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top aligned."
|
| - RenderBlock {P} at (0,754) size 769x485
|
| - RenderText {#text} at (0,2) size 759x198
|
| - text run at (0,2) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
|
| - text run at (412,2) width 345: "This means that the lines of text within it should be separated"
|
| - text run at (0,22) width 78: "by six pixels. "
|
| - text run at (77,22) width 682: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding (5px),"
|
| - text run at (0,185) width 351: "border (10px) and margins (15px) within the line box, such as "
|
| + RenderText {#text} at (465,223) size 28x17
|
| + text run at (465,223) width 28: " and "
|
| + RenderImage {IMG} at (492.39,223) size 200x200
|
| + RenderText {#text} at (692,223) size 769x218
|
| + text run at (692,223) width 8: ". "
|
| + text run at (699,223) width 39: "This is"
|
| + text run at (0,424) width 769: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top aligned."
|
| + RenderBlock {P} at (0,790) size 769x483
|
| + RenderText {#text} at (0,1) size 759x199
|
| + text run at (0,1) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
|
| + text run at (412,1) width 345: "This means that the lines of text within it should be separated"
|
| + text run at (0,21) width 78: "by six pixels. "
|
| + text run at (77,21) width 682: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding (5px),"
|
| + text run at (0,183) width 351: "border (10px) and margins (15px) within the line box, such as "
|
| RenderImage {IMG} at (365.70,55) size 130x130 [border: (10px solid #000000)]
|
| - RenderText {#text} at (510,185) size 28x15
|
| - text run at (510,185) width 28: " and "
|
| - RenderImage {IMG} at (552.91,200) size 130x130 [border: (10px solid #000000)]
|
| - RenderText {#text} at (697,185) size 769x257
|
| - text run at (697,185) width 8: ". "
|
| - text run at (704,185) width 39: "This is"
|
| - text run at (0,347) width 769: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top aligned."
|
| - text run at (0,367) width 735: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this paragraph, so for the first image the bottom"
|
| - text run at (0,387) width 753: "border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin 15px below"
|
| - text run at (0,427) width 103: "the top of the text "
|
| - RenderImage {IMG} at (92.25,395) size 80x80 [border: (10px solid #000000)]
|
| - RenderText {#text} at (162,427) size 737x55
|
| - text run at (162,427) width 8: ". "
|
| - text run at (169,427) width 568: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward the"
|
| - text run at (0,467) width 374: "image in the vertical direction, and also in the horizontal direction."
|
| - LayoutTable {TABLE} at (0,1253) size 769x998 [border: (1px outset #808080)]
|
| - LayoutTableSection {TBODY} at (1,1) size 767x996
|
| - LayoutTableRow {TR} at (0,0) size 767x24
|
| - LayoutTableCell {TD} at (0,0) size 767x24 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
|
| - RenderInline {STRONG} at (0,0) size 163x16
|
| - RenderText {#text} at (4,4) size 163x16
|
| + RenderText {#text} at (510,183) size 28x17
|
| + text run at (510,183) width 28: " and "
|
| + RenderImage {IMG} at (552.91,198) size 130x130 [border: (10px solid #000000)]
|
| + RenderText {#text} at (697,183) size 769x257
|
| + text run at (697,183) width 8: ". "
|
| + text run at (704,183) width 39: "This is"
|
| + text run at (0,344) width 769: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top aligned."
|
| + text run at (0,364) width 735: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this paragraph, so for the first image the bottom"
|
| + text run at (0,384) width 753: "border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin 15px below"
|
| + text run at (0,423) width 103: "the top of the text "
|
| + RenderImage {IMG} at (92.25,393) size 80x80 [border: (10px solid #000000)]
|
| + RenderText {#text} at (162,423) size 737x58
|
| + text run at (162,423) width 8: ". "
|
| + text run at (169,423) width 568: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward the"
|
| + text run at (0,464) width 374: "image in the vertical direction, and also in the horizontal direction."
|
| + LayoutTable {TABLE} at (0,1287) size 769x996 [border: (1px outset #808080)]
|
| + LayoutTableSection {TBODY} at (1,1) size 767x994
|
| + LayoutTableRow {TR} at (0,0) size 767x26
|
| + LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
|
| + RenderInline {STRONG} at (0,0) size 163x18
|
| + RenderText {#text} at (4,4) size 163x18
|
| text run at (4,4) width 163: "TABLE Testing Section"
|
| - LayoutTableRow {TR} at (0,24) size 767x972
|
| - LayoutTableCell {TD} at (0,498) size 12x24 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
|
| - RenderText {#text} at (4,4) size 4x16
|
| + LayoutTableRow {TR} at (0,26) size 767x968
|
| + LayoutTableCell {TD} at (0,497) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
|
| + RenderText {#text} at (4,4) size 4x18
|
| text run at (4,4) width 4: " "
|
| - LayoutTableCell {TD} at (12,24) size 755x972 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
|
| - RenderBlock {P} at (4,4) size 747x465
|
| - RenderText {#text} at (0,2) size 720x238
|
| - text run at (0,2) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
|
| - text run at (412,2) width 288: "This means that the lines of text within it should be"
|
| - text run at (0,22) width 423: "separated by six pixels, three of which are part of the line-box of each line. "
|
| - text run at (422,22) width 298: "Any images within the paragraph should increase the"
|
| - text run at (0,225) width 366: "height of the line-box so that they fit within the line box, such as "
|
| + LayoutTableCell {TD} at (12,26) size 755x968 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
|
| + RenderBlock {P} at (4,4) size 747x463
|
| + RenderText {#text} at (0,1) size 720x239
|
| + text run at (0,1) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
|
| + text run at (412,1) width 288: "This means that the lines of text within it should be"
|
| + text run at (0,21) width 423: "separated by six pixels, three of which are part of the line-box of each line. "
|
| + text run at (422,21) width 298: "Any images within the paragraph should increase the"
|
| + text run at (0,223) width 366: "height of the line-box so that they fit within the line box, such as "
|
| RenderImage {IMG} at (365.09,40) size 200x200
|
| - RenderText {#text} at (565,225) size 28x15
|
| - text run at (565,225) width 28: " and "
|
| - RenderImage {IMG} at (0,245) size 200x200
|
| - RenderText {#text} at (200,245) size 733x217
|
| - text run at (200,245) width 7: ". "
|
| - text run at (207,245) width 526: "This is additional text to make sure that there is enough room left below the image so that this"
|
| - text run at (0,447) width 281: "line does not hit the image that is text-top aligned."
|
| - RenderBlock {P} at (4,483) size 747x485
|
| - RenderText {#text} at (0,2) size 729x198
|
| - text run at (0,2) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
|
| - text run at (412,2) width 288: "This means that the lines of text within it should be"
|
| - text run at (0,22) width 135: "separated by six pixels. "
|
| - text run at (134,22) width 595: "Any images within the paragraph should increase the height of the line-box so that they fit, including their"
|
| - text run at (0,185) width 437: "padding (5px), border (10px) and margins (15px) within the line box, such as "
|
| + RenderText {#text} at (565,223) size 28x17
|
| + text run at (565,223) width 28: " and "
|
| + RenderImage {IMG} at (0,243) size 200x200
|
| + RenderText {#text} at (200,243) size 733x218
|
| + text run at (200,243) width 7: ". "
|
| + text run at (207,243) width 526: "This is additional text to make sure that there is enough room left below the image so that this"
|
| + text run at (0,444) width 281: "line does not hit the image that is text-top aligned."
|
| + RenderBlock {P} at (4,481) size 747x483
|
| + RenderText {#text} at (0,1) size 729x199
|
| + text run at (0,1) width 413: "This paragraph should have a font size of 14px and a line height of 20px. "
|
| + text run at (412,1) width 288: "This means that the lines of text within it should be"
|
| + text run at (0,21) width 135: "separated by six pixels. "
|
| + text run at (134,21) width 595: "Any images within the paragraph should increase the height of the line-box so that they fit, including their"
|
| + text run at (0,183) width 437: "padding (5px), border (10px) and margins (15px) within the line box, such as "
|
| RenderImage {IMG} at (451.63,55) size 130x130 [border: (10px solid #000000)]
|
| - RenderText {#text} at (596,185) size 28x15
|
| - text run at (596,185) width 28: " and "
|
| - RenderImage {IMG} at (15,220) size 130x130 [border: (10px solid #000000)]
|
| - RenderText {#text} at (160,205) size 747x237
|
| - text run at (160,205) width 7: ". "
|
| - text run at (167,205) width 580: "This is additional text to make sure that there is enough room left below the image so that this line does"
|
| - text run at (0,367) width 231: "not hit the image that is text-top aligned. "
|
| - text run at (230,367) width 489: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this"
|
| - text run at (0,387) width 735: "paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the second"
|
| - text run at (0,427) width 367: "image the top border should begin 15px below the top of the text "
|
| - RenderImage {IMG} at (356.64,395) size 80x80 [border: (10px solid #000000)]
|
| - RenderText {#text} at (426,427) size 740x55
|
| - text run at (426,427) width 8: ". "
|
| - text run at (433,427) width 307: "The last image in this paragraph has -10px margins set"
|
| - text run at (0,467) width 635: "on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction."
|
| + RenderText {#text} at (596,183) size 28x17
|
| + text run at (596,183) width 28: " and "
|
| + RenderImage {IMG} at (15,218) size 130x130 [border: (10px solid #000000)]
|
| + RenderText {#text} at (160,203) size 747x237
|
| + text run at (160,203) width 7: ". "
|
| + text run at (167,203) width 580: "This is additional text to make sure that there is enough room left below the image so that this line does"
|
| + text run at (0,364) width 231: "not hit the image that is text-top aligned. "
|
| + text run at (230,364) width 489: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this"
|
| + text run at (0,384) width 735: "paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the second"
|
| + text run at (0,423) width 367: "image the top border should begin 15px below the top of the text "
|
| + RenderImage {IMG} at (356.64,393) size 80x80 [border: (10px solid #000000)]
|
| + RenderText {#text} at (426,423) size 740x58
|
| + text run at (426,423) width 8: ". "
|
| + text run at (433,423) width 307: "The last image in this paragraph has -10px margins set"
|
| + text run at (0,464) width 635: "on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction."
|
|
|
Chromium Code Reviews
