| Index: third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/vertical_formatting-expected.txt
|
| diff --git a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/vertical_formatting-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/vertical_formatting-expected.txt
|
| index 16183357124f97482ad447589100d9bd419b38e1..de2cfdf9119b4d51de0ee635ed48f2ae25a88c10 100644
|
| --- a/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/vertical_formatting-expected.txt
|
| +++ b/third_party/WebKit/LayoutTests/platform/linux/css1/formatting_model/vertical_formatting-expected.txt
|
| @@ -70,15 +70,15 @@ layer at (0,0) size 785x2579 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| text run at (0,0) width 156: "This is another paragraph."
|
| LayoutBlockFlow {DIV} at (0,805.73) size 769x115.56
|
| LayoutBlockFlow {P} at (0,75.56) size 769x40
|
| - LayoutText {#text} at (0,0) size 752x39
|
| + LayoutText {#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 752: "below, because vertical margins of nested elements should collapse only if there is no border or padding between the margins."
|
| + 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."
|
| LayoutBlockFlow {P} at (0,959.08) size 769x20
|
| LayoutText {#text} at (0,0) size 103x19
|
| text run at (0,0) width 103: "This is more text."
|
| LayoutBlockFlow {P} at (0,995.08) size 769x115.58
|
| - LayoutText {#text} at (0,0) size 747x39
|
| - text run at (0,0) width 747: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a negative"
|
| + LayoutText {#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."
|
| LayoutBlockFlow {P} at (0,1072.88) size 769x77.78
|
| LayoutText {#text} at (0,38) size 753x39
|
| @@ -95,9 +95,9 @@ layer at (0,0) size 785x2579 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| text run at (384,20) width 375: "(non-floating) one above it, since the float should not effect the"
|
| text run at (384,40) width 115: "paragraph spacing."
|
| LayoutBlockFlow {P} at (0,1302.22) size 769x77.78
|
| - LayoutText {#text} at (0,0) size 765x39
|
| - text run at (0,0) width 530: "There should be two centimeters of padding between this paragraph and the one below. "
|
| - text run at (529,0) width 236: "Padding does not collapse, and there is"
|
| + LayoutText {#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."
|
| LayoutBlockFlow {P} at (0,1380) size 769x57.78
|
| LayoutText {#text} at (0,38) size 158x19
|
| @@ -136,17 +136,17 @@ layer at (0,0) size 785x2579 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| text run at (0,0) width 156: "This is another paragraph."
|
| LayoutBlockFlow {DIV} at (4,422.73) size 747x135.56
|
| LayoutBlockFlow {P} at (0,75.56) size 747x60
|
| - LayoutText {#text} at (0,0) size 724x59
|
| + LayoutText {#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 724: "text below, because vertical margins of nested elements should collapse only if there is no border or padding between 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."
|
| LayoutBlockFlow {P} at (4,596.08) size 747x20
|
| LayoutText {#text} at (0,0) size 103x19
|
| text run at (0,0) width 103: "This is more text."
|
| LayoutBlockFlow {P} at (4,632.08) size 747x115.58
|
| - LayoutText {#text} at (0,0) size 747x39
|
| - text run at (0,0) width 747: "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."
|
| + LayoutText {#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."
|
| LayoutBlockFlow {P} at (4,709.88) size 747x77.78
|
| LayoutText {#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"
|
| @@ -162,9 +162,9 @@ layer at (0,0) size 785x2579 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| text run at (373,20) width 338: "the (non-floating) one above it, since the float should not"
|
| text run at (373,40) width 174: "effect the paragraph spacing."
|
| LayoutBlockFlow {P} at (4,939.22) size 747x77.78
|
| - LayoutText {#text} at (0,0) size 718x39
|
| - text run at (0,0) width 530: "There should be two centimeters of padding between this paragraph and the one below. "
|
| - text run at (529,0) width 189: "Padding does not collapse, and"
|
| + LayoutText {#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."
|
| LayoutBlockFlow {P} at (4,1017) size 747x57.78
|
| LayoutText {#text} at (0,38) size 158x19
|
|
|