| Index: third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt
|
| diff --git a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt
|
| index f77ea8c65a9ae8895ff79d25495b39d7134cdc83..6ada91b2a634f0780a2a1e6102652194bec89c73 100644
|
| --- a/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt
|
| +++ b/third_party/WebKit/LayoutTests/platform/mac/css1/formatting_model/vertical_formatting-expected.txt
|
| @@ -72,14 +72,14 @@ layer at (0,0) size 785x2487 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| LayoutBlockFlow {P} at (0,75.56) size 769x54
|
| LayoutText {#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,18) width 718: "the text below, because vertical margins of nested elements should collapse only if there is no border or padding"
|
| + 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."
|
| LayoutBlockFlow {P} at (0,935.08) size 769x18
|
| LayoutText {#text} at (0,0) size 112x18
|
| text run at (0,0) width 112: "This is more text."
|
| LayoutBlockFlow {P} at (0,969.08) size 769x111.58
|
| - LayoutText {#text} at (0,0) size 738x36
|
| - text run at (0,0) width 738: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a"
|
| + LayoutText {#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,18) width 467: "negative margin with the largest absolute value of the margins collapsed."
|
| LayoutBlockFlow {P} at (0,1042.88) size 769x73.78
|
| LayoutText {#text} at (0,38) size 754x36
|
| @@ -96,9 +96,9 @@ layer at (0,0) size 785x2487 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| text run at (384,18) width 364: "the (non-floating) one above it, since the float should not"
|
| text run at (384,36) width 185: "effect the paragraph spacing."
|
| LayoutBlockFlow {P} at (0,1262.22) size 769x73.78
|
| - LayoutText {#text} at (0,0) size 760x36
|
| - text run at (0,0) width 562: "There should be two centimeters of padding between this paragraph and the one below. "
|
| - text run at (561,0) width 199: "Padding does not collapse, and"
|
| + LayoutText {#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,18) width 239: "there is 1cm of padding on each side."
|
| LayoutBlockFlow {P} at (0,1336) size 769x55.78
|
| LayoutText {#text} at (0,38) size 171x18
|
| @@ -137,16 +137,16 @@ layer at (0,0) size 785x2487 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| text run at (0,0) width 168: "This is another paragraph."
|
| LayoutBlockFlow {DIV} at (4,406.73) size 747x129.56
|
| LayoutBlockFlow {P} at (0,75.56) size 747x54
|
| - LayoutText {#text} at (0,0) size 745x54
|
| + LayoutText {#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,18) width 745: "and the text below, because vertical margins of nested elements should collapse only if there is no border or padding"
|
| + 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."
|
| LayoutBlockFlow {P} at (4,574.08) size 747x18
|
| LayoutText {#text} at (0,0) size 112x18
|
| text run at (0,0) width 112: "This is more text."
|
| LayoutBlockFlow {P} at (4,608.08) size 747x111.58
|
| - LayoutText {#text} at (0,0) size 738x36
|
| - text run at (0,0) width 738: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a"
|
| + LayoutText {#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,18) width 467: "negative margin with the largest absolute value of the margins collapsed."
|
| LayoutBlockFlow {P} at (4,681.88) size 747x73.78
|
| LayoutText {#text} at (0,38) size 727x36
|
| @@ -163,9 +163,9 @@ layer at (0,0) size 785x2487 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| text run at (373,18) width 366: "and the (non-floating) one above it, since the float should"
|
| text run at (373,36) width 210: "not effect the paragraph spacing."
|
| LayoutBlockFlow {P} at (4,901.22) size 747x73.78
|
| - LayoutText {#text} at (0,0) size 733x36
|
| - text run at (0,0) width 562: "There should be two centimeters of padding between this paragraph and the one below. "
|
| - text run at (561,0) width 172: "Padding does not collapse,"
|
| + LayoutText {#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,18) width 266: "and there is 1cm of padding on each side."
|
| LayoutBlockFlow {P} at (4,975) size 747x55.78
|
| LayoutText {#text} at (0,38) size 171x18
|
|
|