Index: LayoutTests/css3/flexbox/multiline-align-self.html |
diff --git a/LayoutTests/css3/flexbox/multiline-align-self.html b/LayoutTests/css3/flexbox/multiline-align-self.html |
index 8f266ff331d07b9e66a3d0b923a8f695a2562fa7..6f8b5b7ebda963e43fd234ba78f918d28a1cd5d4 100644 |
--- a/LayoutTests/css3/flexbox/multiline-align-self.html |
+++ b/LayoutTests/css3/flexbox/multiline-align-self.html |
@@ -770,7 +770,7 @@ var expectations = { |
'column': { |
'ltr': { |
'wrap': { |
- 'flexbox': [70, 170], |
+ 'flexbox': [70, 60], |
'child1': [10, 10, 60, 0], |
'child2': [10, 10, 50, 10], |
'child3': [10, 10, 40, 20], |
@@ -787,43 +787,43 @@ var expectations = { |
'child14': [10, 30, 0, 30], |
}, |
'wrap-reverse': { |
- 'flexbox': [70, 170], |
- 'child1': [10, 10, 60, 160], |
- 'child2': [10, 10, 50, 150], |
- 'child3': [10, 10, 40, 140], |
- 'child4': [10, 10, 30, 160], |
- 'child5': [10, 10, 20, 160], |
- 'child6': [10, 30, 10, 140], |
- 'child7': [10, 30, 0, 140], |
- 'child8': [10, 10, 60, 130], |
- 'child9': [10, 10, 50, 120], |
- 'child10': [10, 10, 40, 110], |
- 'child11': [10, 10, 30, 130], |
- 'child12': [10, 10, 20, 130], |
- 'child13': [10, 30, 10, 110], |
- 'child14': [10, 30, 0, 110], |
+ 'flexbox': [70, 60], |
+ 'child1': [10, 10, 60, 50], |
+ 'child2': [10, 10, 50, 40], |
+ 'child3': [10, 10, 40, 30], |
+ 'child4': [10, 10, 30, 50], |
+ 'child5': [10, 10, 20, 50], |
+ 'child6': [10, 30, 10, 30], |
+ 'child7': [10, 30, 0, 30], |
+ 'child8': [10, 10, 60, 20], |
+ 'child9': [10, 10, 50, 10], |
+ 'child10': [10, 10, 40, 0], |
+ 'child11': [10, 10, 30, 20], |
+ 'child12': [10, 10, 20, 20], |
+ 'child13': [10, 30, 10, 0], |
+ 'child14': [10, 30, 0, 0], |
}, |
}, |
'rtl': { |
'wrap': { |
- 'flexbox': [70, 170], |
- 'child1': [10, 10, 60, 160], |
- 'child2': [10, 10, 50, 150], |
- 'child3': [10, 10, 40, 140], |
- 'child4': [10, 10, 30, 160], |
- 'child5': [10, 10, 20, 155], |
- 'child6': [10, 30, 10, 140], |
- 'child7': [10, 30, 0, 140], |
- 'child8': [10, 10, 60, 130], |
- 'child9': [10, 10, 50, 120], |
- 'child10': [10, 10, 40, 110], |
- 'child11': [10, 10, 30, 130], |
- 'child12': [10, 10, 20, 125], |
- 'child13': [10, 30, 10, 110], |
- 'child14': [10, 30, 0, 110], |
+ 'flexbox': [70, 60], |
+ 'child1': [10, 10, 60, 50], |
+ 'child2': [10, 10, 50, 40], |
+ 'child3': [10, 10, 40, 30], |
+ 'child4': [10, 10, 30, 50], |
+ 'child5': [10, 10, 20, 45], |
+ 'child6': [10, 30, 10, 30], |
+ 'child7': [10, 30, 0, 30], |
+ 'child8': [10, 10, 60, 20], |
+ 'child9': [10, 10, 50, 10], |
+ 'child10': [10, 10, 40, 0], |
+ 'child11': [10, 10, 30, 20], |
+ 'child12': [10, 10, 20, 15], |
+ 'child13': [10, 30, 10, 0], |
+ 'child14': [10, 30, 0, 0], |
}, |
'wrap-reverse': { |
- 'flexbox': [70, 170], |
+ 'flexbox': [70, 60], |
'child1': [10, 10, 60, 0], |
'child2': [10, 10, 50, 10], |
'child3': [10, 10, 40, 20], |
@@ -918,7 +918,7 @@ var expectations = { |
'column-reverse': { |
'ltr': { |
'wrap': { |
- 'flexbox': [70, 170], |
+ 'flexbox': [70, 60], |
'child1': [10, 10, 0, 0], |
'child2': [10, 10, 10, 10], |
'child3': [10, 10, 20, 20], |
@@ -935,43 +935,43 @@ var expectations = { |
'child14': [10, 30, 60, 30], |
}, |
'wrap-reverse': { |
- 'flexbox': [70, 170], |
- 'child1': [10, 10, 0, 160], |
- 'child2': [10, 10, 10, 150], |
- 'child3': [10, 10, 20, 140], |
- 'child4': [10, 10, 30, 160], |
- 'child5': [10, 10, 40, 160], |
- 'child6': [10, 30, 50, 140], |
- 'child7': [10, 30, 60, 140], |
- 'child8': [10, 10, 0, 130], |
- 'child9': [10, 10, 10, 120], |
- 'child10': [10, 10, 20, 110], |
- 'child11': [10, 10, 30, 130], |
- 'child12': [10, 10, 40, 130], |
- 'child13': [10, 30, 50, 110], |
- 'child14': [10, 30, 60, 110], |
+ 'flexbox': [70, 60], |
+ 'child1': [10, 10, 0, 50], |
+ 'child2': [10, 10, 10, 40], |
+ 'child3': [10, 10, 20, 30], |
+ 'child4': [10, 10, 30, 50], |
+ 'child5': [10, 10, 40, 50], |
+ 'child6': [10, 30, 50, 30], |
+ 'child7': [10, 30, 60, 30], |
+ 'child8': [10, 10, 0, 20], |
+ 'child9': [10, 10, 10, 10], |
+ 'child10': [10, 10, 20, 0], |
+ 'child11': [10, 10, 30, 20], |
+ 'child12': [10, 10, 40, 20], |
+ 'child13': [10, 30, 50, 0], |
+ 'child14': [10, 30, 60, 0], |
}, |
}, |
'rtl': { |
'wrap': { |
- 'flexbox': [70, 170], |
- 'child1': [10, 10, 0, 160], |
- 'child2': [10, 10, 10, 150], |
- 'child3': [10, 10, 20, 140], |
- 'child4': [10, 10, 30, 160], |
- 'child5': [10, 10, 40, 155], |
- 'child6': [10, 30, 50, 140], |
- 'child7': [10, 30, 60, 140], |
- 'child8': [10, 10, 0, 130], |
- 'child9': [10, 10, 10, 120], |
- 'child10': [10, 10, 20, 110], |
- 'child11': [10, 10, 30, 130], |
- 'child12': [10, 10, 40, 125], |
- 'child13': [10, 30, 50, 110], |
- 'child14': [10, 30, 60, 110], |
+ 'flexbox': [70, 60], |
+ 'child1': [10, 10, 0, 50], |
+ 'child2': [10, 10, 10, 40], |
+ 'child3': [10, 10, 20, 30], |
+ 'child4': [10, 10, 30, 50], |
+ 'child5': [10, 10, 40, 45], |
+ 'child6': [10, 30, 50, 30], |
+ 'child7': [10, 30, 60, 30], |
+ 'child8': [10, 10, 0, 20], |
+ 'child9': [10, 10, 10, 10], |
+ 'child10': [10, 10, 20, 0], |
+ 'child11': [10, 10, 30, 20], |
+ 'child12': [10, 10, 40, 15], |
+ 'child13': [10, 30, 50, 0], |
+ 'child14': [10, 30, 60, 0], |
}, |
'wrap-reverse': { |
- 'flexbox': [70, 170], |
+ 'flexbox': [70, 60], |
'child1': [10, 10, 0, 0], |
'child2': [10, 10, 10, 10], |
'child3': [10, 10, 20, 20], |
@@ -1068,7 +1068,7 @@ var expectations = { |
'column': { |
'ltr': { |
'wrap': { |
- 'flexbox': [70, 170], |
+ 'flexbox': [70, 60], |
'child1': [10, 10, 0, 0], |
'child2': [10, 10, 10, 10], |
'child3': [10, 10, 20, 20], |
@@ -1085,43 +1085,43 @@ var expectations = { |
'child14': [10, 30, 60, 30], |
}, |
'wrap-reverse': { |
- 'flexbox': [70, 170], |
- 'child1': [10, 10, 0, 160], |
- 'child2': [10, 10, 10, 150], |
- 'child3': [10, 10, 20, 140], |
- 'child4': [10, 10, 30, 160], |
- 'child5': [10, 10, 40, 160], |
- 'child6': [10, 30, 50, 140], |
- 'child7': [10, 30, 60, 140], |
- 'child8': [10, 10, 0, 130], |
- 'child9': [10, 10, 10, 120], |
- 'child10': [10, 10, 20, 110], |
- 'child11': [10, 10, 30, 130], |
- 'child12': [10, 10, 40, 130], |
- 'child13': [10, 30, 50, 110], |
- 'child14': [10, 30, 60, 110], |
+ 'flexbox': [70, 60], |
+ 'child1': [10, 10, 0, 50], |
+ 'child2': [10, 10, 10, 40], |
+ 'child3': [10, 10, 20, 30], |
+ 'child4': [10, 10, 30, 50], |
+ 'child5': [10, 10, 40, 50], |
+ 'child6': [10, 30, 50, 30], |
+ 'child7': [10, 30, 60, 30], |
+ 'child8': [10, 10, 0, 20], |
+ 'child9': [10, 10, 10, 10], |
+ 'child10': [10, 10, 20, 0], |
+ 'child11': [10, 10, 30, 20], |
+ 'child12': [10, 10, 40, 20], |
+ 'child13': [10, 30, 50, 0], |
+ 'child14': [10, 30, 60, 0], |
}, |
}, |
'rtl': { |
'wrap': { |
- 'flexbox': [70, 170], |
- 'child1': [10, 10, 0, 160], |
- 'child2': [10, 10, 10, 150], |
- 'child3': [10, 10, 20, 140], |
- 'child4': [10, 10, 30, 160], |
- 'child5': [10, 10, 40, 155], |
- 'child6': [10, 30, 50, 140], |
- 'child7': [10, 30, 60, 140], |
- 'child8': [10, 10, 0, 130], |
- 'child9': [10, 10, 10, 120], |
- 'child10': [10, 10, 20, 110], |
- 'child11': [10, 10, 30, 130], |
- 'child12': [10, 10, 40, 125], |
- 'child13': [10, 30, 50, 110], |
- 'child14': [10, 30, 60, 110], |
+ 'flexbox': [70, 60], |
+ 'child1': [10, 10, 0, 50], |
+ 'child2': [10, 10, 10, 40], |
+ 'child3': [10, 10, 20, 30], |
+ 'child4': [10, 10, 30, 50], |
+ 'child5': [10, 10, 40, 45], |
+ 'child6': [10, 30, 50, 30], |
+ 'child7': [10, 30, 60, 30], |
+ 'child8': [10, 10, 0, 20], |
+ 'child9': [10, 10, 10, 10], |
+ 'child10': [10, 10, 20, 0], |
+ 'child11': [10, 10, 30, 20], |
+ 'child12': [10, 10, 40, 15], |
+ 'child13': [10, 30, 50, 0], |
+ 'child14': [10, 30, 60, 0], |
}, |
'wrap-reverse': { |
- 'flexbox': [70, 170], |
+ 'flexbox': [70, 60], |
'child1': [10, 10, 0, 0], |
'child2': [10, 10, 10, 10], |
'child3': [10, 10, 20, 20], |
@@ -1216,7 +1216,7 @@ var expectations = { |
'column-reverse': { |
'ltr': { |
'wrap': { |
- 'flexbox': [70, 170], |
+ 'flexbox': [70, 60], |
'child1': [10, 10, 60, 0], |
'child2': [10, 10, 50, 10], |
'child3': [10, 10, 40, 20], |
@@ -1233,43 +1233,43 @@ var expectations = { |
'child14': [10, 30, 0, 30], |
}, |
'wrap-reverse': { |
- 'flexbox': [70, 170], |
- 'child1': [10, 10, 60, 160], |
- 'child2': [10, 10, 50, 150], |
- 'child3': [10, 10, 40, 140], |
- 'child4': [10, 10, 30, 160], |
- 'child5': [10, 10, 20, 160], |
- 'child6': [10, 30, 10, 140], |
- 'child7': [10, 30, 0, 140], |
- 'child8': [10, 10, 60, 130], |
- 'child9': [10, 10, 50, 120], |
- 'child10': [10, 10, 40, 110], |
- 'child11': [10, 10, 30, 130], |
- 'child12': [10, 10, 20, 130], |
- 'child13': [10, 30, 10, 110], |
- 'child14': [10, 30, 0, 110], |
+ 'flexbox': [70, 60], |
+ 'child1': [10, 10, 60, 50], |
+ 'child2': [10, 10, 50, 40], |
+ 'child3': [10, 10, 40, 30], |
+ 'child4': [10, 10, 30, 50], |
+ 'child5': [10, 10, 20, 50], |
+ 'child6': [10, 30, 10, 30], |
+ 'child7': [10, 30, 0, 30], |
+ 'child8': [10, 10, 60, 20], |
+ 'child9': [10, 10, 50, 10], |
+ 'child10': [10, 10, 40, 0], |
+ 'child11': [10, 10, 30, 20], |
+ 'child12': [10, 10, 20, 20], |
+ 'child13': [10, 30, 10, 0], |
+ 'child14': [10, 30, 0, 0], |
}, |
}, |
'rtl': { |
'wrap': { |
- 'flexbox': [70, 170], |
- 'child1': [10, 10, 60, 160], |
- 'child2': [10, 10, 50, 150], |
- 'child3': [10, 10, 40, 140], |
- 'child4': [10, 10, 30, 160], |
- 'child5': [10, 10, 20, 155], |
- 'child6': [10, 30, 10, 140], |
- 'child7': [10, 30, 0, 140], |
- 'child8': [10, 10, 60, 130], |
- 'child9': [10, 10, 50, 120], |
- 'child10': [10, 10, 40, 110], |
- 'child11': [10, 10, 30, 130], |
- 'child12': [10, 10, 20, 125], |
- 'child13': [10, 30, 10, 110], |
- 'child14': [10, 30, 0, 110], |
+ 'flexbox': [70, 60], |
+ 'child1': [10, 10, 60, 50], |
+ 'child2': [10, 10, 50, 40], |
+ 'child3': [10, 10, 40, 30], |
+ 'child4': [10, 10, 30, 50], |
+ 'child5': [10, 10, 20, 45], |
+ 'child6': [10, 30, 10, 30], |
+ 'child7': [10, 30, 0, 30], |
+ 'child8': [10, 10, 60, 20], |
+ 'child9': [10, 10, 50, 10], |
+ 'child10': [10, 10, 40, 0], |
+ 'child11': [10, 10, 30, 20], |
+ 'child12': [10, 10, 20, 15], |
+ 'child13': [10, 30, 10, 0], |
+ 'child14': [10, 30, 0, 0], |
}, |
'wrap-reverse': { |
- 'flexbox': [70, 170], |
+ 'flexbox': [70, 60], |
'child1': [10, 10, 60, 0], |
'child2': [10, 10, 50, 10], |
'child3': [10, 10, 40, 20], |