Index: third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.txt |
diff --git a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.txt b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.txt |
index b4c505087c467c5b82366f8a051f0efb50d1e199..8fec926e6793177374dce53ead73c9f4fb885ae2 100644 |
--- a/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.txt |
+++ b/third_party/WebKit/LayoutTests/platform/win/css1/formatting_model/vertical_formatting-expected.txt |
@@ -72,14 +72,14 @@ layer at (0,0) size 785x2507 backgroundClip at (0,0) size 785x600 clip at (0,0) |
LayoutBlockFlow {P} at (0,75.56) size 769x54 |
LayoutText {#text} at (0,0) size 750x53 |
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,955.08) size 769x18 |
LayoutText {#text} at (0,0) size 112x17 |
text run at (0,0) width 112: "This is more text." |
LayoutBlockFlow {P} at (0,989.08) size 769x111.58 |
- LayoutText {#text} at (0,0) size 738x35 |
- 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 739x35 |
+ 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,1062.88) size 769x73.78 |
LayoutText {#text} at (0,38) size 754x35 |
@@ -96,9 +96,9 @@ layer at (0,0) size 785x2507 backgroundClip at (0,0) size 785x600 clip at (0,0) |
text run at (384,18) width 365: "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,1282.22) size 769x73.78 |
- LayoutText {#text} at (0,0) size 760x35 |
- 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 761x35 |
+ 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,1356) size 769x55.78 |
LayoutText {#text} at (0,38) size 171x17 |
@@ -137,16 +137,16 @@ layer at (0,0) size 785x2507 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 745x53 |
+ LayoutText {#text} at (0,0) size 746x53 |
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 112x17 |
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 738x35 |
- 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 739x35 |
+ 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 727x35 |
@@ -163,9 +163,9 @@ layer at (0,0) size 785x2507 backgroundClip at (0,0) size 785x600 clip at (0,0) |
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." |
LayoutBlockFlow {P} at (4,901.22) size 747x73.78 |
- LayoutText {#text} at (0,0) size 733x35 |
- 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 734x35 |
+ 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 171x17 |