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

Unified Diff: LayoutTests/platform/win/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/win/css1/formatting_model/replaced_elements-expected.txt ('k') | LayoutTests/platform/win/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/win/css1/formatting_model/vertical_formatting-expected.txt

diff --git a/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.txt b/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.txt

index 56f8494d131827f71be1cae2f51219a84840a757..2a20f41d3c58864037208ed8bf93923ed0111907 100644

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

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

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

layer at (0,0) size 785x2579

RenderView at (0,0) size 785x600

layer at (0,0) size 785x2579

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

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

+ RenderBlock {HTML} at (0,0) size 785x2578.78

+ RenderBody {BODY} at (8,8) size 769x2562.78 [bgcolor=#CCCCCC]

RenderBlock {P} at (0,0) size 769x20

RenderText {#text} at (0,0) size 337x19

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

@@ -52,57 +52,57 @@ layer at (0,0) size 785x2579

RenderText {#text} at (0,0) size 720x39

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

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

- RenderBlock {P} at (0,502) size 769x21

+ RenderBlock {P} at (0,502.58) size 769x20

RenderText {#text} at (0,0) size 156x19

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

- RenderBlock {P} at (0,538) size 769x21

+ RenderBlock {P} at (0,538.58) size 769x20

RenderText {#text} at (0,0) size 472x19

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

- RenderBlock {P} at (0,634) size 769x21

+ RenderBlock {P} at (0,634.16) size 769x20

RenderText {#text} at (0,0) size 156x19

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

- RenderBlock {P} at (0,670) size 769x41

+ RenderBlock {P} at (0,670.16) size 769x40

RenderText {#text} at (0,0) size 756x39

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

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

- RenderBlock {P} at (0,747) size 769x21

+ RenderBlock {P} at (0,747.95) size 769x20

RenderText {#text} at (0,0) size 156x19

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

- RenderBlock {DIV} at (0,805) size 769x117

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

+ RenderBlock {DIV} at (0,805.73) size 769x115.56

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

RenderText {#text} at (0,0) size 753x39

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 the text"

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

- RenderBlock {P} at (0,959) size 769x21

+ RenderBlock {P} at (0,959.08) size 769x20

RenderText {#text} at (0,0) size 103x19

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

- RenderBlock {P} at (0,995) size 769x116

+ RenderBlock {P} at (0,995.08) size 769x115.58

RenderText {#text} at (0,0) size 748x39

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

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

- RenderBlock {P} at (0,1072) size 769x79

+ RenderBlock {P} at (0,1072.88) size 769x77.78

RenderText {#text} at (0,38) size 753x39

text run at (0,38) width 753: "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 one"

text run at (0,58) width 146: "below it and to the right."

- RenderBlock (floating) {P} at (0,1226) size 385x61

+ RenderBlock (floating) {P} at (0,1226.22) size 384.50x60

RenderText {#text} at (0,0) size 366x59

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

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

text run at (0,40) width 56: "elements."

- RenderBlock {P} at (0,1188) size 769x61

+ RenderBlock {P} at (0,1188.44) size 769x60

RenderText {#text} at (385,0) size 381x59

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

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

text run at (385,40) width 114: "paragraph spacing."

- RenderBlock {P} at (0,1302) size 769x78

+ RenderBlock {P} at (0,1302.22) size 769x77.78

RenderText {#text} at (0,0) size 766x39

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

text run at (531,0) width 235: "Padding does not collapse, and there is"

text run at (0,20) width 177: "1cm of padding on each side."

- RenderBlock {P} at (0,1380) size 769x58

+ RenderBlock {P} at (0,1380) size 769x57.78

RenderText {#text} at (0,38) size 158x19

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

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

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

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

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

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

@@ -113,59 +113,59 @@ layer at (0,0) size 785x2579

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

RenderText {#text} at (4,4) size 4x19

text run at (4,4) width 4: " "

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

+ RenderTableCell {TD} at (12,28) size 755x1078.78 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]

RenderBlock {P} at (4,4) size 747x40

RenderText {#text} at (0,0) size 720x39

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

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

- RenderBlock {P} at (4,119) size 747x21

+ RenderBlock {P} at (4,119.58) size 747x20

RenderText {#text} at (0,0) size 156x19

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

- RenderBlock {P} at (4,155) size 747x21

+ RenderBlock {P} at (4,155.58) size 747x20

RenderText {#text} at (0,0) size 472x19

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

- RenderBlock {P} at (4,251) size 747x21

+ RenderBlock {P} at (4,251.16) size 747x20

RenderText {#text} at (0,0) size 156x19

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

- RenderBlock {P} at (4,287) size 747x41

+ RenderBlock {P} at (4,287.16) size 747x40

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

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

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

- RenderBlock {P} at (4,364) size 747x21

+ RenderBlock {P} at (4,364.95) size 747x20

RenderText {#text} at (0,0) size 156x19

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

- RenderBlock {DIV} at (4,422) size 747x137

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

+ RenderBlock {DIV} at (4,422.73) size 747x135.56

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

RenderText {#text} at (0,0) size 725x59

text run at (0,0) width 724: "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,20) width 725: "text below, because vertical margins of nested elements should collapse only if there is no border or padding between the"

text run at (0,40) width 50: "margins."

- RenderBlock {P} at (4,596) size 747x21

+ RenderBlock {P} at (4,596.08) size 747x20

RenderText {#text} at (0,0) size 103x19

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

- RenderBlock {P} at (4,632) size 747x116

+ RenderBlock {P} at (4,632.08) size 747x115.58

RenderText {#text} at (0,0) size 695x39

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

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

- RenderBlock {P} at (4,709) size 747x79

+ RenderBlock {P} at (4,709.88) size 747x77.78

RenderText {#text} at (0,38) size 727x39

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 and the"

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

- RenderBlock (floating) {P} at (4,863) size 374x61

+ RenderBlock (floating) {P} at (4,863.22) size 373.50x60

RenderText {#text} at (0,0) size 366x59

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

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

text run at (0,40) width 56: "elements."

- RenderBlock {P} at (4,825) size 747x61

+ RenderBlock {P} at (4,825.44) size 747x60

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

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

text run at (374,20) width 337: "the (non-floating) one above it, since the float should not"

text run at (374,40) width 173: "effect the paragraph spacing."

- RenderBlock {P} at (4,939) size 747x78

+ RenderBlock {P} at (4,939.22) size 747x77.78

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

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

text run at (531,0) width 188: "Padding does not collapse, and"

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

- RenderBlock {P} at (4,1017) size 747x58

+ RenderBlock {P} at (4,1017) size 747x57.78

RenderText {#text} at (0,38) size 158x19

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