| Index: LayoutTests/css3/flexbox/multiline.html
|
| diff --git a/LayoutTests/css3/flexbox/multiline.html b/LayoutTests/css3/flexbox/multiline.html
|
| index 957c74ef9ac3da74521a329fcc1454a88e750fd3..29303aa03d1e66a8000ecfdaa69009962807a004 100644
|
| --- a/LayoutTests/css3/flexbox/multiline.html
|
| +++ b/LayoutTests/css3/flexbox/multiline.html
|
| @@ -421,7 +421,7 @@ var expectations = {
|
| 'column': {
|
| 'ltr': {
|
| 'wrap': {
|
| - 'flexbox': [60, 50],
|
| + 'flexbox': [60, 20],
|
| 'child1': [30, 5, 30, 0],
|
| 'child2': [30, 10, 0, 0],
|
| 'child3': [60, 5, 0, 10],
|
| @@ -429,25 +429,25 @@ var expectations = {
|
| 'child5': [60, 10, 0, 35],
|
| },
|
| 'wrap-reverse': {
|
| - 'flexbox': [60, 50],
|
| - 'child1': [30, 5, 30, 45],
|
| - 'child2': [30, 10, 0, 40],
|
| - 'child3': [60, 5, 0, 35],
|
| - 'child4': [70, 20, -10, 15],
|
| - 'child5': [60, 10, 0, 5],
|
| + 'flexbox': [60, 20],
|
| + 'child1': [30, 5, 30, 15],
|
| + 'child2': [30, 10, 0, 10],
|
| + 'child3': [60, 5, 0, 5],
|
| + 'child4': [70, 20, -10, -15],
|
| + 'child5': [60, 10, 0, -25],
|
| },
|
| },
|
| 'rtl': {
|
| 'wrap': {
|
| - 'flexbox': [60, 50],
|
| - 'child1': [30, 5, 30, 45],
|
| - 'child2': [30, 10, 0, 40],
|
| - 'child3': [60, 5, 0, 35],
|
| - 'child4': [70, 20, -10, 15],
|
| - 'child5': [60, 10, 0, 5],
|
| + 'flexbox': [60, 20],
|
| + 'child1': [30, 5, 30, 15],
|
| + 'child2': [30, 10, 0, 10],
|
| + 'child3': [60, 5, 0, 5],
|
| + 'child4': [70, 20, -10, -15],
|
| + 'child5': [60, 10, 0, -25],
|
| },
|
| 'wrap-reverse': {
|
| - 'flexbox': [60, 50],
|
| + 'flexbox': [60, 20],
|
| 'child1': [30, 5, 30, 0],
|
| 'child2': [30, 10, 0, 0],
|
| 'child3': [60, 5, 0, 10],
|
| @@ -497,7 +497,7 @@ var expectations = {
|
| 'column-reverse': {
|
| 'ltr': {
|
| 'wrap': {
|
| - 'flexbox': [60, 50],
|
| + 'flexbox': [60, 20],
|
| 'child1': [30, 5, 0, 0],
|
| 'child2': [30, 10, 30, 0],
|
| 'child3': [60, 5, 0, 10],
|
| @@ -505,25 +505,25 @@ var expectations = {
|
| 'child5': [60, 10, 0, 35],
|
| },
|
| 'wrap-reverse': {
|
| - 'flexbox': [60, 50],
|
| - 'child1': [30, 5, 0, 45],
|
| - 'child2': [30, 10, 30, 40],
|
| - 'child3': [60, 5, 0, 35],
|
| - 'child4': [70, 20, 0, 15],
|
| - 'child5': [60, 10, 0, 5],
|
| + 'flexbox': [60, 20],
|
| + 'child1': [30, 5, 0, 15],
|
| + 'child2': [30, 10, 30, 10],
|
| + 'child3': [60, 5, 0, 5],
|
| + 'child4': [70, 20, 0, -15],
|
| + 'child5': [60, 10, 0, -25],
|
| },
|
| },
|
| 'rtl': {
|
| 'wrap': {
|
| - 'flexbox': [60, 50],
|
| - 'child1': [30, 5, 0, 45],
|
| - 'child2': [30, 10, 30, 40],
|
| - 'child3': [60, 5, 0, 35],
|
| - 'child4': [70, 20, 0, 15],
|
| - 'child5': [60, 10, 0, 5],
|
| + 'flexbox': [60, 20],
|
| + 'child1': [30, 5, 0, 15],
|
| + 'child2': [30, 10, 30, 10],
|
| + 'child3': [60, 5, 0, 5],
|
| + 'child4': [70, 20, 0,-15],
|
| + 'child5': [60, 10, 0, -25],
|
| },
|
| 'wrap-reverse': {
|
| - 'flexbox': [60, 50],
|
| + 'flexbox': [60, 20],
|
| 'child1': [30, 5, 0, 0],
|
| 'child2': [30, 10, 30, 0],
|
| 'child3': [60, 5, 0, 10],
|
| @@ -575,7 +575,7 @@ var expectations = {
|
| 'column': {
|
| 'ltr': {
|
| 'wrap': {
|
| - 'flexbox': [60, 50],
|
| + 'flexbox': [60, 20],
|
| 'child1': [30, 5, 0, 0],
|
| 'child2': [30, 10, 30, 0],
|
| 'child3': [60, 5, 0, 10],
|
| @@ -583,25 +583,25 @@ var expectations = {
|
| 'child5': [60, 10, 0, 35],
|
| },
|
| 'wrap-reverse': {
|
| - 'flexbox': [60, 50],
|
| - 'child1': [30, 5, 0, 45],
|
| - 'child2': [30, 10, 30, 40],
|
| - 'child3': [60, 5, 0, 35],
|
| - 'child4': [70, 20, 0, 15],
|
| - 'child5': [60, 10, 0, 5],
|
| + 'flexbox': [60, 20],
|
| + 'child1': [30, 5, 0, 15],
|
| + 'child2': [30, 10, 30, 10],
|
| + 'child3': [60, 5, 0, 5],
|
| + 'child4': [70, 20, 0, -15],
|
| + 'child5': [60, 10, 0, -25],
|
| },
|
| },
|
| 'rtl': {
|
| 'wrap': {
|
| - 'flexbox': [60, 50],
|
| - 'child1': [30, 5, 0, 45],
|
| - 'child2': [30, 10, 30, 40],
|
| - 'child3': [60, 5, 0, 35],
|
| - 'child4': [70, 20, 0, 15],
|
| - 'child5': [60, 10, 0, 5],
|
| + 'flexbox': [60, 20],
|
| + 'child1': [30, 5, 0, 15],
|
| + 'child2': [30, 10, 30, 10],
|
| + 'child3': [60, 5, 0, 5],
|
| + 'child4': [70, 20, 0, -15],
|
| + 'child5': [60, 10, 0, -25],
|
| },
|
| 'wrap-reverse': {
|
| - 'flexbox': [60, 50],
|
| + 'flexbox': [60, 20],
|
| 'child1': [30, 5, 0, 0],
|
| 'child2': [30, 10, 30, 0],
|
| 'child3': [60, 5, 0, 10],
|
| @@ -651,7 +651,7 @@ var expectations = {
|
| 'column-reverse': {
|
| 'ltr': {
|
| 'wrap': {
|
| - 'flexbox': [60, 50],
|
| + 'flexbox': [60, 20],
|
| 'child1': [30, 5, 30, 0],
|
| 'child2': [30, 10, 0, 0],
|
| 'child3': [60, 5, 0, 10],
|
| @@ -659,25 +659,25 @@ var expectations = {
|
| 'child5': [60, 10, 0, 35],
|
| },
|
| 'wrap-reverse': {
|
| - 'flexbox': [60, 50],
|
| - 'child1': [30, 5, 30, 45],
|
| - 'child2': [30, 10, 0, 40],
|
| - 'child3': [60, 5, 0, 35],
|
| - 'child4': [70, 20, -10, 15],
|
| - 'child5': [60, 10, 0, 5],
|
| + 'flexbox': [60, 20],
|
| + 'child1': [30, 5, 30, 15],
|
| + 'child2': [30, 10, 0, 10],
|
| + 'child3': [60, 5, 0, 5],
|
| + 'child4': [70, 20, -10, -15],
|
| + 'child5': [60, 10, 0, -25],
|
| },
|
| },
|
| 'rtl': {
|
| 'wrap': {
|
| - 'flexbox': [60, 50],
|
| - 'child1': [30, 5, 30, 45],
|
| - 'child2': [30, 10, 0, 40],
|
| - 'child3': [60, 5, 0, 35],
|
| - 'child4': [70, 20, -10, 15],
|
| - 'child5': [60, 10, 0, 5],
|
| + 'flexbox': [60, 20],
|
| + 'child1': [30, 5, 30, 15],
|
| + 'child2': [30, 10, 0, 10],
|
| + 'child3': [60, 5, 0, 5],
|
| + 'child4': [70, 20, -10, -15],
|
| + 'child5': [60, 10, 0, -25],
|
| },
|
| 'wrap-reverse': {
|
| - 'flexbox': [60, 50],
|
| + 'flexbox': [60, 20],
|
| 'child1': [30, 5, 30, 0],
|
| 'child2': [30, 10, 0, 0],
|
| 'child3': [60, 5, 0, 10],
|
|
|