| Index: LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt
|
| diff --git a/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt b/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt
|
| index 16205337f2a2e549e701509f0bc9f6546d3602cf..ff842af2bcbacabc812d622cc2b1cf988d01f88c 100644
|
| --- a/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt
|
| +++ b/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt
|
| @@ -1,172 +1,172 @@
|
| -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2355
|
| +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2487
|
| RenderView at (0,0) size 800x600
|
| -layer at (0,0) size 785x2355 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| - RenderBlock {HTML} at (0,0) size 785x2354.78
|
| - RenderBody {BODY} at (8,8) size 769x2338.78 [bgcolor=#CCCCCC]
|
| - RenderBlock {P} at (0,0) size 769x16
|
| - RenderText {#text} at (0,0) size 363x16
|
| +layer at (0,0) size 785x2487 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| + RenderBlock {HTML} at (0,0) size 785x2486.78
|
| + RenderBody {BODY} at (8,8) size 769x2470.78 [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 769x260
|
| - RenderText {#text} at (0,0) size 484x260
|
| + RenderBlock {PRE} at (0,34) size 769x300
|
| + RenderText {#text} at (0,0) size 484x300
|
| text run at (0,0) width 359: "P.one {margin-bottom: 2cm; padding-bottom: 0;}"
|
| text run at (358,0) width 1: " "
|
| - text run at (0,13) width 313: "P.two {margin-top: 2cm; padding-top: 0;}"
|
| - text run at (312,13) width 1: " "
|
| - text run at (0,26) width 313: "P.three {margin-top: 0; padding-top: 0;}"
|
| - text run at (312,26) width 1: " "
|
| - text run at (0,39) width 336: "P.four {margin-top: -1cm; margin-bottom: 0;"
|
| - text run at (335,39) width 1: " "
|
| - text run at (0,52) width 336: " padding-top: 0; padding-bottom: 0;}"
|
| - text run at (335,52) width 1: " "
|
| - text run at (0,65) width 359: "DIV.five {margin-top: 1cm; margin-bottom: 1cm;"
|
| - text run at (358,65) width 1: " "
|
| - text run at (0,78) width 367: " padding-top: 1cm; padding-bottom: 0;}"
|
| - text run at (366,78) width 1: " "
|
| - text run at (0,91) width 336: "P.six {margin-top: 1cm; margin-bottom: 1cm;"
|
| - text run at (335,91) width 1: " "
|
| - text run at (0,104) width 328: " padding-top: 0; padding-bottom: 0;}"
|
| - text run at (327,104) width 1: " "
|
| - text run at (0,117) width 328: "P.seven {margin-top: 1cm; padding-top: 0;}"
|
| - text run at (327,117) width 1: " "
|
| - text run at (0,130) width 398: "P.eight {margin-bottom: -1cm; padding-bottom: 2cm;}"
|
| - text run at (397,130) width 1: " "
|
| - text run at (0,143) width 336: "P.nine {margin-top: -1cm; padding-top: 1cm;"
|
| - text run at (335,143) width 1: " "
|
| - text run at (0,156) width 367: " padding-bottom: 0; margin-bottom: 1cm;}"
|
| - text run at (366,156) width 1: " "
|
| - text run at (0,169) width 297: "P.ten {margin-top: 1cm;padding-top: 0;"
|
| - text run at (296,169) width 1: " "
|
| - text run at (0,182) width 242: " float: left;width: 50%;}"
|
| - text run at (241,182) width 1: " "
|
| - text run at (0,195) width 437: "P.eleven {margin-top: 1cm; padding-top: 0; clear: none;}"
|
| - text run at (436,195) width 1: " "
|
| - text run at (0,208) width 484: "P.twelve {margin-bottom: 0; padding-bottom: 1cm; clear: both;}"
|
| - text run at (483,208) width 1: " "
|
| - text run at (0,221) width 352: "P.thirteen {margin-top: 0; padding-top: 1cm;}"
|
| - text run at (351,221) width 1: " "
|
| - text run at (0,234) width 157: "TABLE {clear: both;}"
|
| - text run at (156,234) width 1: " "
|
| - text run at (0,247) width 0: " "
|
| - RenderBlock {HR} at (0,305) size 769x2 [border: (1px inset #EEEEEE)]
|
| - RenderBlock {P} at (0,323) size 769x32
|
| - RenderText {#text} at (0,0) size 723x32
|
| + text run at (0,15) width 313: "P.two {margin-top: 2cm; padding-top: 0;}"
|
| + text run at (312,15) width 1: " "
|
| + text run at (0,30) width 313: "P.three {margin-top: 0; padding-top: 0;}"
|
| + text run at (312,30) width 1: " "
|
| + text run at (0,45) width 336: "P.four {margin-top: -1cm; margin-bottom: 0;"
|
| + text run at (335,45) width 1: " "
|
| + text run at (0,60) width 336: " padding-top: 0; padding-bottom: 0;}"
|
| + text run at (335,60) width 1: " "
|
| + text run at (0,75) width 359: "DIV.five {margin-top: 1cm; margin-bottom: 1cm;"
|
| + text run at (358,75) width 1: " "
|
| + text run at (0,90) width 367: " padding-top: 1cm; padding-bottom: 0;}"
|
| + text run at (366,90) width 1: " "
|
| + text run at (0,105) width 336: "P.six {margin-top: 1cm; margin-bottom: 1cm;"
|
| + text run at (335,105) width 1: " "
|
| + text run at (0,120) width 328: " padding-top: 0; padding-bottom: 0;}"
|
| + text run at (327,120) width 1: " "
|
| + text run at (0,135) width 328: "P.seven {margin-top: 1cm; padding-top: 0;}"
|
| + text run at (327,135) width 1: " "
|
| + text run at (0,150) width 398: "P.eight {margin-bottom: -1cm; padding-bottom: 2cm;}"
|
| + text run at (397,150) width 1: " "
|
| + text run at (0,165) width 336: "P.nine {margin-top: -1cm; padding-top: 1cm;"
|
| + text run at (335,165) width 1: " "
|
| + text run at (0,180) width 367: " padding-bottom: 0; margin-bottom: 1cm;}"
|
| + text run at (366,180) width 1: " "
|
| + text run at (0,195) width 297: "P.ten {margin-top: 1cm;padding-top: 0;"
|
| + text run at (296,195) width 1: " "
|
| + text run at (0,210) width 242: " float: left;width: 50%;}"
|
| + text run at (241,210) width 1: " "
|
| + text run at (0,225) width 437: "P.eleven {margin-top: 1cm; padding-top: 0; clear: none;}"
|
| + text run at (436,225) width 1: " "
|
| + text run at (0,240) width 484: "P.twelve {margin-bottom: 0; padding-bottom: 1cm; clear: both;}"
|
| + text run at (483,240) width 1: " "
|
| + text run at (0,255) width 352: "P.thirteen {margin-top: 0; padding-top: 1cm;}"
|
| + text run at (351,255) width 1: " "
|
| + text run at (0,270) width 157: "TABLE {clear: both;}"
|
| + text run at (156,270) width 1: " "
|
| + text run at (0,285) width 0: " "
|
| + RenderBlock {HR} at (0,347) size 769x2 [border: (1px inset #EEEEEE)]
|
| + RenderBlock {P} at (0,365) size 769x36
|
| + RenderText {#text} at (0,0) size 723x36
|
| text run at (0,0) width 723: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins"
|
| - text run at (0,16) width 309: "should collapse to the maximum of the margins."
|
| - RenderBlock {P} at (0,430.58) size 769x16
|
| - RenderText {#text} at (0,0) size 168x16
|
| + text run at (0,18) width 309: "should collapse to the maximum of the margins."
|
| + RenderBlock {P} at (0,476.58) size 769x18
|
| + RenderText {#text} at (0,0) size 168x18
|
| text run at (0,0) width 168: "This is another paragraph."
|
| - RenderBlock {P} at (0,462.58) size 769x16
|
| - RenderText {#text} at (0,0) size 503x16
|
| + RenderBlock {P} at (0,510.58) size 769x18
|
| + RenderText {#text} at (0,0) size 503x18
|
| text run at (0,0) width 503: "There should be a two-centimeter margin between this paragraph and the next."
|
| - RenderBlock {P} at (0,554.16) size 769x16
|
| - RenderText {#text} at (0,0) size 168x16
|
| + RenderBlock {P} at (0,604.16) size 769x18
|
| + RenderText {#text} at (0,0) size 168x18
|
| text run at (0,0) width 168: "This is another paragraph."
|
| - RenderBlock {P} at (0,586.16) size 769x32
|
| - RenderText {#text} at (0,0) size 732x32
|
| + RenderBlock {P} at (0,638.16) size 769x36
|
| + RenderText {#text} at (0,0) size 732x36
|
| text run at (0,0) width 732: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative"
|
| - text run at (0,16) width 474: "margin, the two margins should be added (the minus sign should be kept)."
|
| - RenderBlock {P} at (0,655.95) size 769x16
|
| - RenderText {#text} at (0,0) size 168x16
|
| + text run at (0,18) width 474: "margin, the two margins should be added (the minus sign should be kept)."
|
| + RenderBlock {P} at (0,711.95) size 769x18
|
| + RenderText {#text} at (0,0) size 168x18
|
| text run at (0,0) width 168: "This is another paragraph."
|
| - RenderBlock {DIV} at (0,709.73) size 769x123.56
|
| - RenderBlock {P} at (0,75.56) size 769x48
|
| - RenderText {#text} at (0,0) size 750x48
|
| + RenderBlock {DIV} at (0,767.73) size 769x129.56
|
| + RenderBlock {P} at (0,75.56) size 769x54
|
| + RenderText {#text} at (0,0) size 750x54
|
| text run at (0,0) width 750: "There should be three centimeters between this text and the text above, but only one centimeter between this text and"
|
| - text run at (0,16) width 719: "the text below, because vertical margins of nested elements should collapse only if there is no border or padding"
|
| - text run at (0,32) width 137: "between the margins."
|
| - RenderBlock {P} at (0,871.08) size 769x16
|
| - RenderText {#text} at (0,0) size 112x16
|
| + text run at (0,18) width 719: "the text below, because vertical margins of nested elements should collapse only if there is no border or padding"
|
| + text run at (0,36) width 137: "between the margins."
|
| + RenderBlock {P} at (0,935.08) size 769x18
|
| + RenderText {#text} at (0,0) size 112x18
|
| text run at (0,0) width 112: "This is more text."
|
| - RenderBlock {P} at (0,903.08) size 769x107.58
|
| - RenderText {#text} at (0,0) size 739x32
|
| + RenderBlock {P} at (0,969.08) size 769x111.58
|
| + RenderText {#text} at (0,0) size 739x36
|
| text run at (0,0) width 739: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a"
|
| - text run at (0,16) width 467: "negative margin with the largest absolute value of the margins collapsed."
|
| - RenderBlock {P} at (0,972.88) size 769x69.78
|
| - RenderText {#text} at (0,38) size 754x32
|
| + text run at (0,18) width 467: "negative margin with the largest absolute value of the margins collapsed."
|
| + RenderBlock {P} at (0,1042.88) size 769x73.78
|
| + RenderText {#text} at (0,38) size 754x36
|
| text run at (0,38) width 754: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and"
|
| - text run at (0,54) width 208: "the one below it and to the right."
|
| - RenderBlock (floating) {P} at (0,1118.22) size 384.50x48
|
| - RenderText {#text} at (0,0) size 362x48
|
| + text run at (0,56) width 208: "the one below it and to the right."
|
| + RenderBlock (floating) {P} at (0,1192.22) size 384.50x54
|
| + RenderText {#text} at (0,0) size 362x54
|
| text run at (0,0) width 362: "There should be two centimeters between this paragraph"
|
| - text run at (0,16) width 347: "and the one above it, since margins do not collapse on"
|
| - text run at (0,32) width 115: "floating elements."
|
| - RenderBlock {P} at (0,1080.44) size 769x48
|
| - RenderText {#text} at (384,0) size 382x48
|
| + text run at (0,18) width 347: "and the one above it, since margins do not collapse on"
|
| + text run at (0,36) width 115: "floating elements."
|
| + RenderBlock {P} at (0,1154.44) size 769x54
|
| + RenderText {#text} at (384,0) size 382x54
|
| text run at (384,0) width 382: "There should be one centimeter between this paragraph and"
|
| - text run at (384,16) width 365: "the (non-floating) one above it, since the float should not"
|
| - text run at (384,32) width 186: "effect the paragraph spacing."
|
| - RenderBlock {P} at (0,1182.22) size 769x69.78
|
| - RenderText {#text} at (0,0) size 761x32
|
| + text run at (384,18) width 365: "the (non-floating) one above it, since the float should not"
|
| + text run at (384,36) width 186: "effect the paragraph spacing."
|
| + RenderBlock {P} at (0,1262.22) size 769x73.78
|
| + RenderText {#text} at (0,0) size 761x36
|
| text run at (0,0) width 563: "There should be two centimeters of padding between this paragraph and the one below. "
|
| text run at (562,0) width 199: "Padding does not collapse, and"
|
| - text run at (0,16) width 239: "there is 1cm of padding on each side."
|
| - RenderBlock {P} at (0,1252) size 769x53.78
|
| - RenderText {#text} at (0,38) size 171x16
|
| + text run at (0,18) width 239: "there is 1cm of padding on each side."
|
| + RenderBlock {P} at (0,1336) size 769x55.78
|
| + RenderText {#text} at (0,38) size 171x18
|
| text run at (0,38) width 171: "This is the next paragraph."
|
| - LayoutTable {TABLE} at (0,1321.78) size 769x1017 [border: (1px outset #808080)]
|
| - LayoutTableSection {TBODY} at (1,1) size 767x1015
|
| - 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
|
| + LayoutTable {TABLE} at (0,1407.78) size 769x1063 [border: (1px outset #808080)]
|
| + LayoutTableSection {TBODY} at (1,1) size 767x1061
|
| + 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 767x991
|
| - LayoutTableCell {TD} at (0,507) 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 767x1035
|
| + LayoutTableCell {TD} at (0,530) 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 755x990.78 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
|
| - RenderBlock {P} at (4,4) size 747x32
|
| - RenderText {#text} at (0,0) size 723x32
|
| + LayoutTableCell {TD} at (12,26) size 755x1034.78 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
|
| + RenderBlock {P} at (4,4) size 747x36
|
| + RenderText {#text} at (0,0) size 723x36
|
| text run at (0,0) width 723: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins"
|
| - text run at (0,16) width 309: "should collapse to the maximum of the margins."
|
| - RenderBlock {P} at (4,111.58) size 747x16
|
| - RenderText {#text} at (0,0) size 168x16
|
| + text run at (0,18) width 309: "should collapse to the maximum of the margins."
|
| + RenderBlock {P} at (4,115.58) size 747x18
|
| + RenderText {#text} at (0,0) size 168x18
|
| text run at (0,0) width 168: "This is another paragraph."
|
| - RenderBlock {P} at (4,143.58) size 747x16
|
| - RenderText {#text} at (0,0) size 503x16
|
| + RenderBlock {P} at (4,149.58) size 747x18
|
| + RenderText {#text} at (0,0) size 503x18
|
| text run at (0,0) width 503: "There should be a two-centimeter margin between this paragraph and the next."
|
| - RenderBlock {P} at (4,235.16) size 747x16
|
| - RenderText {#text} at (0,0) size 168x16
|
| + RenderBlock {P} at (4,243.16) size 747x18
|
| + RenderText {#text} at (0,0) size 168x18
|
| text run at (0,0) width 168: "This is another paragraph."
|
| - RenderBlock {P} at (4,267.16) size 747x32
|
| - RenderText {#text} at (0,0) size 732x32
|
| + RenderBlock {P} at (4,277.16) size 747x36
|
| + RenderText {#text} at (0,0) size 732x36
|
| text run at (0,0) width 732: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative"
|
| - text run at (0,16) width 474: "margin, the two margins should be added (the minus sign should be kept)."
|
| - RenderBlock {P} at (4,336.95) size 747x16
|
| - RenderText {#text} at (0,0) size 168x16
|
| + text run at (0,18) width 474: "margin, the two margins should be added (the minus sign should be kept)."
|
| + RenderBlock {P} at (4,350.95) size 747x18
|
| + RenderText {#text} at (0,0) size 168x18
|
| text run at (0,0) width 168: "This is another paragraph."
|
| - RenderBlock {DIV} at (4,390.73) size 747x123.56
|
| - RenderBlock {P} at (0,75.56) size 747x48
|
| - RenderText {#text} at (0,0) size 746x48
|
| + RenderBlock {DIV} at (4,406.73) size 747x129.56
|
| + RenderBlock {P} at (0,75.56) size 747x54
|
| + RenderText {#text} at (0,0) size 746x54
|
| text run at (0,0) width 722: "There should be three centimeters between this text and the text above, but only one centimeter between this text"
|
| - text run at (0,16) width 746: "and the text below, because vertical margins of nested elements should collapse only if there is no border or padding"
|
| - text run at (0,32) width 137: "between the margins."
|
| - RenderBlock {P} at (4,552.08) size 747x16
|
| - RenderText {#text} at (0,0) size 112x16
|
| + text run at (0,18) width 746: "and the text below, because vertical margins of nested elements should collapse only if there is no border or padding"
|
| + text run at (0,36) width 137: "between the margins."
|
| + RenderBlock {P} at (4,574.08) size 747x18
|
| + RenderText {#text} at (0,0) size 112x18
|
| text run at (0,0) width 112: "This is more text."
|
| - RenderBlock {P} at (4,584.08) size 747x107.58
|
| - RenderText {#text} at (0,0) size 739x32
|
| + RenderBlock {P} at (4,608.08) size 747x111.58
|
| + RenderText {#text} at (0,0) size 739x36
|
| text run at (0,0) width 739: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a"
|
| - text run at (0,16) width 467: "negative margin with the largest absolute value of the margins collapsed."
|
| - RenderBlock {P} at (4,653.88) size 747x69.78
|
| - RenderText {#text} at (0,38) size 727x32
|
| + text run at (0,18) width 467: "negative margin with the largest absolute value of the margins collapsed."
|
| + RenderBlock {P} at (4,681.88) size 747x73.78
|
| + RenderText {#text} at (0,38) size 727x36
|
| text run at (0,38) width 727: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it"
|
| - text run at (0,54) width 236: "and the one below it and to the right."
|
| - RenderBlock (floating) {P} at (4,799.22) size 373.50x48
|
| - RenderText {#text} at (0,0) size 362x48
|
| + text run at (0,56) width 236: "and the one below it and to the right."
|
| + RenderBlock (floating) {P} at (4,831.22) size 373.50x54
|
| + RenderText {#text} at (0,0) size 362x54
|
| text run at (0,0) width 362: "There should be two centimeters between this paragraph"
|
| - text run at (0,16) width 347: "and the one above it, since margins do not collapse on"
|
| - text run at (0,32) width 115: "floating elements."
|
| - RenderBlock {P} at (4,761.44) size 747x48
|
| - RenderText {#text} at (373,0) size 368x48
|
| + text run at (0,18) width 347: "and the one above it, since margins do not collapse on"
|
| + text run at (0,36) width 115: "floating elements."
|
| + RenderBlock {P} at (4,793.44) size 747x54
|
| + RenderText {#text} at (373,0) size 368x54
|
| text run at (373,0) width 355: "There should be one centimeter between this paragraph"
|
| - text run at (373,16) width 368: "and the (non-floating) one above it, since the float should"
|
| - text run at (373,32) width 210: "not effect the paragraph spacing."
|
| - RenderBlock {P} at (4,863.22) size 747x69.78
|
| - RenderText {#text} at (0,0) size 734x32
|
| + text run at (373,18) width 368: "and the (non-floating) one above it, since the float should"
|
| + text run at (373,36) width 210: "not effect the paragraph spacing."
|
| + RenderBlock {P} at (4,901.22) size 747x73.78
|
| + RenderText {#text} at (0,0) size 734x36
|
| text run at (0,0) width 563: "There should be two centimeters of padding between this paragraph and the one below. "
|
| text run at (562,0) width 172: "Padding does not collapse,"
|
| - text run at (0,16) width 266: "and there is 1cm of padding on each side."
|
| - RenderBlock {P} at (4,933) size 747x53.78
|
| - RenderText {#text} at (0,38) size 171x16
|
| + text run at (0,18) width 266: "and there is 1cm of padding on each side."
|
| + RenderBlock {P} at (4,975) size 747x55.78
|
| + RenderText {#text} at (0,38) size 171x18
|
| text run at (0,38) width 171: "This is the next paragraph."
|
|
|
Chromium Code Reviews
