| Index: third_party/WebKit/LayoutTests/platform/mac/fast/block/float/shrink-to-avoid-float-complexity-expected.txt
|
| diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/shrink-to-avoid-float-complexity-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/shrink-to-avoid-float-complexity-expected.txt
|
| index ebc109f02c042026da5e394d2a3f0d3695d3e070..9f52d3ba2059a8e774c6c2b1a589608abadb6ac1 100644
|
| --- a/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/shrink-to-avoid-float-complexity-expected.txt
|
| +++ b/third_party/WebKit/LayoutTests/platform/mac/fast/block/float/shrink-to-avoid-float-complexity-expected.txt
|
| @@ -4,34 +4,34 @@ layer at (0,0) size 785x2083 backgroundClip at (0,0) size 785x600 clip at (0,0)
|
| LayoutBlockFlow {HTML} at (0,0) size 785x2083.34
|
| LayoutBlockFlow {BODY} at (8,19.91) size 769x2047.44
|
| LayoutBlockFlow {H2} at (0,0) size 769x28
|
| - LayoutText {#text} at (0,0) size 149x28
|
| - text run at (0,0) width 149: "Test 1 (1 float)"
|
| + LayoutText {#text} at (0,0) size 146x28
|
| + text run at (0,0) width 146: "Test 1 (1 float)"
|
| LayoutBlockFlow {HR} at (48,295.91) size 673x2 [border: (1px inset #EEEEEE)]
|
| LayoutBlockFlow {H2} at (0,345.91) size 769x28
|
| - LayoutText {#text} at (0,0) size 149x28
|
| - text run at (0,0) width 149: "Test 2 (1 float)"
|
| + LayoutText {#text} at (0,0) size 146x28
|
| + text run at (0,0) width 146: "Test 2 (1 float)"
|
| LayoutBlockFlow {HR} at (48,641.81) size 673x2 [border: (1px inset #EEEEEE)]
|
| LayoutBlockFlow {H2} at (0,691.81) size 769x28
|
| - LayoutText {#text} at (0,0) size 149x28
|
| - text run at (0,0) width 149: "Test 3 (1 float)"
|
| + LayoutText {#text} at (0,0) size 146x28
|
| + text run at (0,0) width 146: "Test 3 (1 float)"
|
| LayoutBlockFlow {HR} at (48,987.72) size 673x2 [border: (1px inset #EEEEEE)]
|
| LayoutBlockFlow {H2} at (0,1037.72) size 769x28
|
| - LayoutText {#text} at (0,0) size 158x28
|
| - text run at (0,0) width 158: "Test 4 (2 floats)"
|
| + LayoutText {#text} at (0,0) size 155x28
|
| + text run at (0,0) width 155: "Test 4 (2 floats)"
|
| LayoutBlockFlow {HR} at (48,1333.63) size 673x2 [border: (1px inset #EEEEEE)]
|
| LayoutBlockFlow {H2} at (0,1383.63) size 769x28
|
| - LayoutText {#text} at (0,0) size 158x28
|
| - text run at (0,0) width 158: "Test 5 (2 floats)"
|
| + LayoutText {#text} at (0,0) size 155x28
|
| + text run at (0,0) width 155: "Test 5 (2 floats)"
|
| LayoutBlockFlow {HR} at (48,1679.53) size 673x2 [border: (1px inset #EEEEEE)]
|
| LayoutBlockFlow {H2} at (0,1729.53) size 769x28
|
| - LayoutText {#text} at (0,0) size 158x28
|
| - text run at (0,0) width 158: "Test 6 (2 floats)"
|
| + LayoutText {#text} at (0,0) size 155x28
|
| + text run at (0,0) width 155: "Test 6 (2 floats)"
|
| layer at (8,68) size 769x200
|
| LayoutBlockFlow {DIV} at (0,47.91) size 769x200 [bgcolor=#C0C0C0]
|
| LayoutBlockFlow (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
|
| - LayoutText {#text} at (36,36) size 125x54
|
| + LayoutText {#text} at (36,36) size 124x54
|
| text run at (36,36) width 122: "This yellow square"
|
| - text run at (36,54) width 125: "is floated left and it"
|
| + text run at (36,54) width 124: "is floated left and it"
|
| text run at (36,72) width 95: "has no margin."
|
| layer at (208,68) size 469x162
|
| LayoutBlockFlow {DIV} at (200,0) size 469x162 [bgcolor=#FFA500]
|
| @@ -52,9 +52,9 @@ layer at (208,68) size 469x162
|
| LayoutText {#text} at (199,36) size 6x18
|
| text run at (199,36) width 6: ";"
|
| LayoutBR {BR} at (204,36) size 1x18
|
| - LayoutText {#text} at (0,54) size 334x18
|
| - text run at (0,54) width 334: "\x{2013} has a 100px left margin and a 100px right margin;"
|
| - LayoutBR {BR} at (333,54) size 1x18
|
| + LayoutText {#text} at (0,54) size 333x18
|
| + text run at (0,54) width 333: "\x{2013} has a 100px left margin and a 100px right margin;"
|
| + LayoutBR {BR} at (332,54) size 1x18
|
| LayoutBR {BR} at (0,72) size 0x18
|
| LayoutText {#text} at (0,90) size 144x18
|
| text run at (0,90) width 144: "This orange rectangle:"
|
| @@ -73,14 +73,14 @@ layer at (208,68) size 469x162
|
| LayoutText {#text} at (199,126) size 6x18
|
| text run at (199,126) width 6: ";"
|
| LayoutBR {BR} at (204,126) size 1x18
|
| - LayoutText {#text} at (0,144) size 334x18
|
| - text run at (0,144) width 334: "\x{2013} has a 100px left margin and a 100px right margin;"
|
| + LayoutText {#text} at (0,144) size 333x18
|
| + text run at (0,144) width 333: "\x{2013} has a 100px left margin and a 100px right margin;"
|
| layer at (8,414) size 769x200 backgroundClip at (8,414) size 769x186 clip at (8,414) size 769x186
|
| LayoutBlockFlow {DIV} at (0,393.81) size 769x200 [bgcolor=#C0C0C0]
|
| LayoutBlockFlow (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
|
| - LayoutText {#text} at (36,36) size 125x54
|
| + LayoutText {#text} at (36,36) size 124x54
|
| text run at (36,36) width 122: "This yellow square"
|
| - text run at (36,54) width 125: "is floated left and it"
|
| + text run at (36,54) width 124: "is floated left and it"
|
| text run at (36,72) width 95: "has no margin."
|
| layer at (208,414) size 569x162
|
| LayoutBlockFlow {DIV} at (200,0) size 569x162 [bgcolor=#FFA500]
|
| @@ -127,9 +127,9 @@ layer at (208,414) size 569x162
|
| layer at (8,760) size 769x200 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
|
| LayoutBlockFlow {DIV} at (0,739.72) size 769x200 [bgcolor=#C0C0C0]
|
| LayoutBlockFlow (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
|
| - LayoutText {#text} at (36,36) size 123x72
|
| + LayoutText {#text} at (36,36) size 122x72
|
| text run at (36,36) width 122: "This yellow square"
|
| - text run at (36,54) width 123: "is a floated left and"
|
| + text run at (36,54) width 122: "is a floated left and"
|
| text run at (36,72) width 80: "it has a right"
|
| text run at (36,90) width 111: "margin of 100px."
|
| layer at (308,760) size 369x162 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
|
| @@ -151,9 +151,9 @@ layer at (308,760) size 369x162 backgroundClip at (0,0) size 0x0 clip at (0,0) s
|
| LayoutText {#text} at (255,36) size 6x18
|
| text run at (255,36) width 6: ";"
|
| LayoutBR {BR} at (260,36) size 1x18
|
| - LayoutText {#text} at (0,54) size 318x18
|
| - text run at (0,54) width 318: "\x{2013} has a 0px left margin and a 100px right margin;"
|
| - LayoutBR {BR} at (317,54) size 1x18
|
| + LayoutText {#text} at (0,54) size 317x18
|
| + text run at (0,54) width 317: "\x{2013} has a 0px left margin and a 100px right margin;"
|
| + LayoutBR {BR} at (316,54) size 1x18
|
| LayoutBR {BR} at (0,72) size 0x18
|
| LayoutText {#text} at (0,90) size 144x18
|
| text run at (0,90) width 144: "This orange rectangle:"
|
| @@ -172,19 +172,19 @@ layer at (308,760) size 369x162 backgroundClip at (0,0) size 0x0 clip at (0,0) s
|
| LayoutText {#text} at (255,126) size 6x18
|
| text run at (255,126) width 6: ";"
|
| LayoutBR {BR} at (260,126) size 1x18
|
| - LayoutText {#text} at (0,144) size 318x18
|
| - text run at (0,144) width 318: "\x{2013} has a 0px left margin and a 100px right margin;"
|
| + LayoutText {#text} at (0,144) size 317x18
|
| + text run at (0,144) width 317: "\x{2013} has a 0px left margin and a 100px right margin;"
|
| layer at (8,1106) size 769x200 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
|
| LayoutBlockFlow {DIV} at (0,1085.63) size 769x200 [bgcolor=#C0C0C0]
|
| LayoutBlockFlow (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
|
| - LayoutText {#text} at (36,36) size 125x54
|
| + LayoutText {#text} at (36,36) size 124x54
|
| text run at (36,36) width 122: "This yellow square"
|
| - text run at (36,54) width 125: "is floated left and it"
|
| + text run at (36,54) width 124: "is floated left and it"
|
| text run at (36,72) width 95: "has no margin."
|
| LayoutBlockFlow (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
|
| LayoutText {#text} at (36,36) size 122x72
|
| text run at (36,36) width 122: "This yellow square"
|
| - text run at (36,54) width 105: "is a floated right"
|
| + text run at (36,54) width 104: "is a floated right"
|
| text run at (36,72) width 82: "and it has no"
|
| text run at (36,90) width 50: "margin."
|
| layer at (208,1106) size 369x162 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
|
| @@ -206,9 +206,9 @@ layer at (208,1106) size 369x162 backgroundClip at (0,0) size 0x0 clip at (0,0)
|
| LayoutText {#text} at (255,36) size 6x18
|
| text run at (255,36) width 6: ";"
|
| LayoutBR {BR} at (260,36) size 1x18
|
| - LayoutText {#text} at (0,54) size 334x18
|
| - text run at (0,54) width 334: "\x{2013} has a 100px left margin and a 100px right margin;"
|
| - LayoutBR {BR} at (333,54) size 1x18
|
| + LayoutText {#text} at (0,54) size 333x18
|
| + text run at (0,54) width 333: "\x{2013} has a 100px left margin and a 100px right margin;"
|
| + LayoutBR {BR} at (332,54) size 1x18
|
| LayoutBR {BR} at (0,72) size 0x18
|
| LayoutText {#text} at (0,90) size 144x18
|
| text run at (0,90) width 144: "This orange rectangle:"
|
| @@ -227,19 +227,19 @@ layer at (208,1106) size 369x162 backgroundClip at (0,0) size 0x0 clip at (0,0)
|
| LayoutText {#text} at (255,126) size 6x18
|
| text run at (255,126) width 6: ";"
|
| LayoutBR {BR} at (260,126) size 1x18
|
| - LayoutText {#text} at (0,144) size 334x18
|
| - text run at (0,144) width 334: "\x{2013} has a 100px left margin and a 100px right margin;"
|
| + LayoutText {#text} at (0,144) size 333x18
|
| + text run at (0,144) width 333: "\x{2013} has a 100px left margin and a 100px right margin;"
|
| layer at (8,1451) size 769x200 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
|
| LayoutBlockFlow {DIV} at (0,1431.53) size 769x200 [bgcolor=#C0C0C0]
|
| LayoutBlockFlow (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
|
| - LayoutText {#text} at (36,36) size 125x54
|
| + LayoutText {#text} at (36,36) size 124x54
|
| text run at (36,36) width 122: "This yellow square"
|
| - text run at (36,54) width 125: "is floated left and it"
|
| + text run at (36,54) width 124: "is floated left and it"
|
| text run at (36,72) width 95: "has no margin."
|
| LayoutBlockFlow (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
|
| LayoutText {#text} at (36,36) size 122x72
|
| text run at (36,36) width 122: "This yellow square"
|
| - text run at (36,54) width 105: "is a floated right"
|
| + text run at (36,54) width 104: "is a floated right"
|
| text run at (36,72) width 82: "and it has no"
|
| text run at (36,90) width 50: "margin."
|
| layer at (208,1451) size 369x162 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
|
| @@ -287,15 +287,15 @@ layer at (208,1451) size 369x162 backgroundClip at (0,0) size 0x0 clip at (0,0)
|
| layer at (8,1797) size 769x270 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
|
| LayoutBlockFlow {DIV} at (0,1777.44) size 769x270 [bgcolor=#C0C0C0]
|
| LayoutBlockFlow (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
|
| - LayoutText {#text} at (36,36) size 125x72
|
| + LayoutText {#text} at (36,36) size 124x72
|
| text run at (36,36) width 122: "This yellow square"
|
| - text run at (36,54) width 125: "is floated left and it"
|
| + text run at (36,54) width 124: "is floated left and it"
|
| text run at (36,72) width 116: "has a right margin"
|
| text run at (36,90) width 62: "of 100px."
|
| LayoutBlockFlow (floating) {DIV} at (569,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
|
| LayoutText {#text} at (36,36) size 122x72
|
| text run at (36,36) width 122: "This yellow square"
|
| - text run at (36,54) width 121: "is floated right and"
|
| + text run at (36,54) width 120: "is floated right and"
|
| text run at (36,72) width 120: "it has a left margin"
|
| text run at (36,90) width 62: "of 100px."
|
| layer at (308,1797) size 169x270 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0
|
| @@ -318,10 +318,10 @@ layer at (308,1797) size 169x270 backgroundClip at (0,0) size 0x0 clip at (0,0)
|
| LayoutText {#text} at (124,72) size 6x18
|
| text run at (124,72) width 6: ";"
|
| LayoutBR {BR} at (129,72) size 1x18
|
| - LayoutText {#text} at (0,90) size 151x36
|
| - text run at (0,90) width 148: "\x{2013} has a 0px left margin"
|
| - text run at (0,108) width 151: "and a 0px right margin;"
|
| - LayoutBR {BR} at (150,108) size 1x18
|
| + LayoutText {#text} at (0,90) size 150x36
|
| + text run at (0,90) width 147: "\x{2013} has a 0px left margin"
|
| + text run at (0,108) width 150: "and a 0px right margin;"
|
| + LayoutBR {BR} at (149,108) size 1x18
|
| LayoutBR {BR} at (0,126) size 0x18
|
| LayoutText {#text} at (0,144) size 144x18
|
| text run at (0,144) width 144: "This orange rectangle:"
|
| @@ -341,6 +341,6 @@ layer at (308,1797) size 169x270 backgroundClip at (0,0) size 0x0 clip at (0,0)
|
| LayoutText {#text} at (124,216) size 6x18
|
| text run at (124,216) width 6: ";"
|
| LayoutBR {BR} at (129,216) size 1x18
|
| - LayoutText {#text} at (0,234) size 151x36
|
| - text run at (0,234) width 148: "\x{2013} has a 0px left margin"
|
| - text run at (0,252) width 151: "and a 0px right margin;"
|
| + LayoutText {#text} at (0,234) size 150x36
|
| + text run at (0,234) width 147: "\x{2013} has a 0px left margin"
|
| + text run at (0,252) width 150: "and a 0px right margin;"
|
|
|