LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt - Issue 20558002: Auto-rebaseline for r154918

Unified Diff: LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt

Issue 20558002: Auto-rebaseline for r154918 (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « LayoutTests/platform/mac/css1/formatting_model/replaced_elements-expected.txt ('k') | LayoutTests/platform/mac/css1/text_properties/vertical_align-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7154f0c2c7881e72b1038bc3bb8dbc1dc3bb710c..fb00e9d06aa9184fb9cdc244929400c6eb12c097 100644

--- a/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt

+++ b/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt

@@ -1,8 +1,8 @@

layer at (0,0) size 785x2487

RenderView at (0,0) size 785x600

layer at (0,0) size 785x2487

- RenderBlock {HTML} at (0,0) size 785x2487

- RenderBody {BODY} at (8,8) size 769x2471 [bgcolor=#CCCCCC]

+ 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 355x18

text run at (0,0) width 355: "The style declarations which apply to the text below are:"

@@ -52,58 +52,58 @@ layer at (0,0) size 785x2487

RenderText {#text} at (0,0) size 754x36

text run at (0,0) width 754: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins should"

text run at (0,18) width 255: "collapse to the maximum of the margins."

- RenderBlock {P} at (0,476) size 769x19

+ RenderBlock {P} at (0,476.58) size 769x18

RenderText {#text} at (0,0) size 164x18

text run at (0,0) width 164: "This is another paragraph."

- RenderBlock {P} at (0,510) size 769x19

+ RenderBlock {P} at (0,510.58) size 769x18

RenderText {#text} at (0,0) size 494x18

text run at (0,0) width 494: "There should be a two-centimeter margin between this paragraph and the next."

- RenderBlock {P} at (0,604) size 769x19

+ RenderBlock {P} at (0,604.16) size 769x18

RenderText {#text} at (0,0) size 164x18

text run at (0,0) width 164: "This is another paragraph."

- RenderBlock {P} at (0,638) size 769x37

+ RenderBlock {P} at (0,638.16) size 769x36

RenderText {#text} at (0,0) size 719x36

text run at (0,0) width 719: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative"

text run at (0,18) width 465: "margin, the two margins should be added (the minus sign should be kept)."

- RenderBlock {P} at (0,711) size 769x19

+ RenderBlock {P} at (0,711.95) size 769x18

RenderText {#text} at (0,0) size 164x18

text run at (0,0) width 164: "This is another paragraph."

- RenderBlock {DIV} at (0,767) size 769x131

- RenderBlock {P} at (0,75) size 769x55

+ RenderBlock {DIV} at (0,767.73) size 769x129.56

+ RenderBlock {P} at (0,75.56) size 769x54

RenderText {#text} at (0,0) size 760x54

text run at (0,0) width 757: "There should be three centimeters between this text and the text above, but only one centimeter between this text and the"

text run at (0,18) width 760: "text below, because vertical margins of nested elements should collapse only if there is no border or padding between the"

text run at (0,36) width 54: "margins."

- RenderBlock {P} at (0,935) size 769x19

+ RenderBlock {P} at (0,935.08) size 769x18

RenderText {#text} at (0,0) size 109x18

text run at (0,0) width 109: "This is more text."

- RenderBlock {P} at (0,969) size 769x112

+ RenderBlock {P} at (0,969.08) size 769x111.58

RenderText {#text} at (0,0) size 726x36

text run at (0,0) width 726: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a"

text run at (0,18) width 456: "negative margin with the largest absolute value of the margins collapsed."

- RenderBlock {P} at (0,1042) size 769x75

+ RenderBlock {P} at (0,1042.88) size 769x73.78

RenderText {#text} at (0,38) size 765x36

text run at (0,38) width 765: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and the"

text run at (0,56) width 181: "one below it and to the right."

- RenderBlock (floating) {P} at (0,1192) size 385x55

+ RenderBlock (floating) {P} at (0,1192.22) size 384.50x54

RenderText {#text} at (0,0) size 382x54

text run at (0,0) width 382: "There should be two centimeters between this paragraph and"

text run at (0,18) width 365: "the one above it, since margins do not collapse on floating"

text run at (0,36) width 59: "elements."

- RenderBlock {P} at (0,1154) size 769x55

+ RenderBlock {P} at (0,1154.44) size 769x54

RenderText {#text} at (385,0) size 375x54

text run at (385,0) width 375: "There should be one centimeter between this paragraph and"

text run at (385,18) width 356: "the (non-floating) one above it, since the float should not"

text run at (385,36) width 181: "effect the paragraph spacing."

- RenderBlock {P} at (0,1262) size 769x74

+ RenderBlock {P} at (0,1262.22) size 769x73.78

RenderText {#text} at (0,0) size 750x36

text run at (0,0) width 555: "There should be two centimeters of padding between this paragraph and the one below. "

text run at (555,0) width 195: "Padding does not collapse, and"

text run at (0,18) width 234: "there is 1cm of padding on each side."

- RenderBlock {P} at (0,1336) size 769x56

+ RenderBlock {P} at (0,1336) size 769x55.78

RenderText {#text} at (0,38) size 167x18

text run at (0,38) width 167: "This is the next paragraph."

- RenderTable {TABLE} at (0,1407) size 769x1064 [border: (1px outset #808080)]

+ RenderTable {TABLE} at (0,1407.78) size 769x1063 [border: (1px outset #808080)]

RenderTableSection {TBODY} at (1,1) size 767x1061

RenderTableRow {TR} at (0,0) size 767x26

RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]

@@ -114,59 +114,59 @@ layer at (0,0) size 785x2487

RenderTableCell {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: " "

- RenderTableCell {TD} at (12,26) size 755x1035 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]

+ RenderTableCell {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 708x36

text run at (0,0) width 708: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins"

text run at (0,18) width 301: "should collapse to the maximum of the margins."

- RenderBlock {P} at (4,115) size 747x19

+ RenderBlock {P} at (4,115.58) size 747x18

RenderText {#text} at (0,0) size 164x18

text run at (0,0) width 164: "This is another paragraph."

- RenderBlock {P} at (4,149) size 747x19

+ RenderBlock {P} at (4,149.58) size 747x18

RenderText {#text} at (0,0) size 494x18

text run at (0,0) width 494: "There should be a two-centimeter margin between this paragraph and the next."

- RenderBlock {P} at (4,243) size 747x19

+ RenderBlock {P} at (4,243.16) size 747x18

RenderText {#text} at (0,0) size 164x18

text run at (0,0) width 164: "This is another paragraph."

- RenderBlock {P} at (4,277) size 747x37

+ RenderBlock {P} at (4,277.16) size 747x36

RenderText {#text} at (0,0) size 719x36

text run at (0,0) width 719: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative"

text run at (0,18) width 465: "margin, the two margins should be added (the minus sign should be kept)."

- RenderBlock {P} at (4,350) size 747x19

+ RenderBlock {P} at (4,350.95) size 747x18

RenderText {#text} at (0,0) size 164x18

text run at (0,0) width 164: "This is another paragraph."

- RenderBlock {DIV} at (4,406) size 747x131

- RenderBlock {P} at (0,75) size 747x55

+ RenderBlock {DIV} at (4,406.73) size 747x129.56

+ RenderBlock {P} at (0,75.56) size 747x54

RenderText {#text} at (0,0) size 734x54

text run at (0,0) width 734: "There should be three centimeters between this text and the text above, but only one centimeter between this text and"

text run at (0,18) width 703: "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 134: "between the margins."

- RenderBlock {P} at (4,574) size 747x19

+ RenderBlock {P} at (4,574.08) size 747x18

RenderText {#text} at (0,0) size 109x18

text run at (0,0) width 109: "This is more text."

- RenderBlock {P} at (4,608) size 747x112

+ RenderBlock {P} at (4,608.08) size 747x111.58

RenderText {#text} at (0,0) size 726x36

text run at (0,0) width 726: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a"

text run at (0,18) width 456: "negative margin with the largest absolute value of the margins collapsed."

- RenderBlock {P} at (4,681) size 747x75

+ RenderBlock {P} at (4,681.88) size 747x73.78

RenderText {#text} at (0,38) size 742x36

text run at (0,38) width 742: "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,56) width 204: "the one below it and to the right."

- RenderBlock (floating) {P} at (4,831) size 374x55

+ RenderBlock (floating) {P} at (4,831.22) size 373.50x54

RenderText {#text} at (0,0) size 355x54

text run at (0,0) width 355: "There should be two centimeters between this paragraph"

text run at (0,18) width 340: "and the one above it, since margins do not collapse on"

text run at (0,36) width 111: "floating elements."

- RenderBlock {P} at (4,793) size 747x55

+ RenderBlock {P} at (4,793.44) size 747x54

RenderText {#text} at (374,0) size 359x54

text run at (374,0) width 348: "There should be one centimeter between this paragraph"

text run at (374,18) width 359: "and the (non-floating) one above it, since the float should"

text run at (374,36) width 205: "not effect the paragraph spacing."

- RenderBlock {P} at (4,901) size 747x74

+ RenderBlock {P} at (4,901.22) size 747x73.78

RenderText {#text} at (0,0) size 723x36

text run at (0,0) width 555: "There should be two centimeters of padding between this paragraph and the one below. "

text run at (555,0) width 168: "Padding does not collapse,"

text run at (0,18) width 261: "and there is 1cm of padding on each side."

- RenderBlock {P} at (4,975) size 747x56

+ RenderBlock {P} at (4,975) size 747x55.78

RenderText {#text} at (0,38) size 167x18

text run at (0,38) width 167: "This is the next paragraph."