Index: third_party/WebKit/LayoutTests/css3/flexbox/multiline-justify-content.html |
diff --git a/third_party/WebKit/LayoutTests/css3/flexbox/multiline-justify-content.html b/third_party/WebKit/LayoutTests/css3/flexbox/multiline-justify-content.html |
index 17b82d377f864bf88f1f0c65d6c56b87c6ab1c70..b0949621a680aab59cd2d51d28d9963a2d20e67f 100644 |
--- a/third_party/WebKit/LayoutTests/css3/flexbox/multiline-justify-content.html |
+++ b/third_party/WebKit/LayoutTests/css3/flexbox/multiline-justify-content.html |
@@ -23,9 +23,6 @@ |
.horizontal-tb { |
-webkit-writing-mode: horizontal-tb; |
} |
-.horizontal-bt { |
- -webkit-writing-mode: horizontal-bt; |
-} |
.vertical-rl { |
-webkit-writing-mode: vertical-rl; |
} |
@@ -701,624 +698,6 @@ var expectations = { |
}, |
}, |
}, |
- 'horizontal-bt': { |
- 'row': { |
- 'ltr': { |
- 'wrap': { |
- 'flex-start': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 0, 10], |
- 'child2': [20, 10, 40, 10], |
- 'child3': [40, 10, 0, 0], |
- 'child4': [20, 10, 40, 0], |
- }, |
- 'flex-end': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 20, 10], |
- 'child2': [20, 10, 60, 10], |
- 'child3': [40, 10, 20, 0], |
- 'child4': [20, 10, 60, 0], |
- }, |
- 'center': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 10, 10], |
- 'child2': [20, 10, 50, 10], |
- 'child3': [40, 10, 10, 0], |
- 'child4': [20, 10, 50, 0], |
- }, |
- 'space-between': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 0, 10], |
- 'child2': [20, 10, 60, 10], |
- 'child3': [40, 10, 0, 0], |
- 'child4': [20, 10, 60, 0], |
- }, |
- 'space-around': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 5, 10], |
- 'child2': [20, 10, 55, 10], |
- 'child3': [40, 10, 5, 0], |
- 'child4': [20, 10, 55, 0], |
- }, |
- }, |
- 'wrap-reverse': { |
- 'flex-start': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 0, 0], |
- 'child2': [20, 10, 40, 0], |
- 'child3': [40, 10, 0, 10], |
- 'child4': [20, 10, 40, 10], |
- }, |
- 'flex-end': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 20, 0], |
- 'child2': [20, 10, 60, 0], |
- 'child3': [40, 10, 20, 10], |
- 'child4': [20, 10, 60, 10], |
- }, |
- 'center': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 10, 0], |
- 'child2': [20, 10, 50, 0], |
- 'child3': [40, 10, 10, 10], |
- 'child4': [20, 10, 50, 10], |
- }, |
- 'space-between': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 0, 0], |
- 'child2': [20, 10, 60, 0], |
- 'child3': [40, 10, 0, 10], |
- 'child4': [20, 10, 60, 10], |
- }, |
- 'space-around': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 5, 0], |
- 'child2': [20, 10, 55, 0], |
- 'child3': [40, 10, 5, 10], |
- 'child4': [20, 10, 55, 10], |
- }, |
- }, |
- }, |
- 'rtl': { |
- 'wrap': { |
- 'flex-start': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 40, 10], |
- 'child2': [20, 10, 20, 10], |
- 'child3': [40, 10, 40, 0], |
- 'child4': [20, 10, 20, 0], |
- }, |
- 'flex-end': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 20, 10], |
- 'child2': [20, 10, 0, 10], |
- 'child3': [40, 10, 20, 0], |
- 'child4': [20, 10, 0, 0], |
- }, |
- 'center': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 30, 10], |
- 'child2': [20, 10, 10, 10], |
- 'child3': [40, 10, 30, 0], |
- 'child4': [20, 10, 10, 0], |
- }, |
- 'space-between': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 40, 10], |
- 'child2': [20, 10, 0, 10], |
- 'child3': [40, 10, 40, 0], |
- 'child4': [20, 10, 0, 0], |
- }, |
- 'space-around': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 35, 10], |
- 'child2': [20, 10, 5, 10], |
- 'child3': [40, 10, 35, 0], |
- 'child4': [20, 10, 5, 0], |
- }, |
- }, |
- 'wrap-reverse': { |
- 'flex-start': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 40, 0], |
- 'child2': [20, 10, 20, 0], |
- 'child3': [40, 10, 40, 10], |
- 'child4': [20, 10, 20, 10], |
- }, |
- 'flex-end': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 20, 0], |
- 'child2': [20, 10, 0, 0], |
- 'child3': [40, 10, 20, 10], |
- 'child4': [20, 10, 0, 10], |
- }, |
- 'center': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 30, 0], |
- 'child2': [20, 10, 10, 0], |
- 'child3': [40, 10, 30, 10], |
- 'child4': [20, 10, 10, 10], |
- }, |
- 'space-between': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 40, 0], |
- 'child2': [20, 10, 0, 0], |
- 'child3': [40, 10, 40, 10], |
- 'child4': [20, 10, 0, 10], |
- }, |
- 'space-around': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 35, 0], |
- 'child2': [20, 10, 5, 0], |
- 'child3': [40, 10, 35, 10], |
- 'child4': [20, 10, 5, 10], |
- }, |
- }, |
- }, |
- }, |
- 'column': { |
- 'ltr': { |
- 'wrap': { |
- 'flex-start': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 40], |
- 'child2': [10, 20, 0, 20], |
- 'child3': [10, 40, 10, 40], |
- 'child4': [10, 20, 10, 20], |
- }, |
- 'flex-end': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 20], |
- 'child2': [10, 20, 0, 0], |
- 'child3': [10, 40, 10, 20], |
- 'child4': [10, 20, 10, 0], |
- }, |
- 'center': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 30], |
- 'child2': [10, 20, 0, 10], |
- 'child3': [10, 40, 10, 30], |
- 'child4': [10, 20, 10, 10], |
- }, |
- 'space-between': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 40], |
- 'child2': [10, 20, 0, 0], |
- 'child3': [10, 40, 10, 40], |
- 'child4': [10, 20, 10, 0], |
- }, |
- 'space-around': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 35], |
- 'child2': [10, 20, 0, 5], |
- 'child3': [10, 40, 10, 35], |
- 'child4': [10, 20, 10, 5], |
- }, |
- }, |
- 'wrap-reverse': { |
- 'flex-start': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 40], |
- 'child2': [10, 20, 90, 20], |
- 'child3': [10, 40, 80, 40], |
- 'child4': [10, 20, 80, 20], |
- }, |
- 'flex-end': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 20], |
- 'child2': [10, 20, 90, 0], |
- 'child3': [10, 40, 80, 20], |
- 'child4': [10, 20, 80, 0], |
- }, |
- 'center': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 30], |
- 'child2': [10, 20, 90, 10], |
- 'child3': [10, 40, 80, 30], |
- 'child4': [10, 20, 80, 10], |
- }, |
- 'space-between': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 40], |
- 'child2': [10, 20, 90, 0], |
- 'child3': [10, 40, 80, 40], |
- 'child4': [10, 20, 80, 0], |
- }, |
- 'space-around': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 35], |
- 'child2': [10, 20, 90, 5], |
- 'child3': [10, 40, 80, 35], |
- 'child4': [10, 20, 80, 5], |
- }, |
- }, |
- }, |
- 'rtl': { |
- 'wrap': { |
- 'flex-start': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 40], |
- 'child2': [10, 20, 90, 20], |
- 'child3': [10, 40, 80, 40], |
- 'child4': [10, 20, 80, 20], |
- }, |
- 'flex-end': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 20], |
- 'child2': [10, 20, 90, 0], |
- 'child3': [10, 40, 80, 20], |
- 'child4': [10, 20, 80, 0], |
- }, |
- 'center': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 30], |
- 'child2': [10, 20, 90, 10], |
- 'child3': [10, 40, 80, 30], |
- 'child4': [10, 20, 80, 10], |
- }, |
- 'space-between': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 40], |
- 'child2': [10, 20, 90, 0], |
- 'child3': [10, 40, 80, 40], |
- 'child4': [10, 20, 80, 0], |
- }, |
- 'space-around': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 35], |
- 'child2': [10, 20, 90, 5], |
- 'child3': [10, 40, 80, 35], |
- 'child4': [10, 20, 80, 5], |
- }, |
- }, |
- 'wrap-reverse': { |
- 'flex-start': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 40], |
- 'child2': [10, 20, 0, 20], |
- 'child3': [10, 40, 10, 40], |
- 'child4': [10, 20, 10, 20], |
- }, |
- 'flex-end': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 20], |
- 'child2': [10, 20, 0, 0], |
- 'child3': [10, 40, 10, 20], |
- 'child4': [10, 20, 10, 0], |
- }, |
- 'center': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 30], |
- 'child2': [10, 20, 0, 10], |
- 'child3': [10, 40, 10, 30], |
- 'child4': [10, 20, 10, 10], |
- }, |
- 'space-between': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 40], |
- 'child2': [10, 20, 0, 0], |
- 'child3': [10, 40, 10, 40], |
- 'child4': [10, 20, 10, 0], |
- }, |
- 'space-around': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 35], |
- 'child2': [10, 20, 0, 5], |
- 'child3': [10, 40, 10, 35], |
- 'child4': [10, 20, 10, 5], |
- }, |
- }, |
- }, |
- }, |
- 'row-reverse': { |
- 'ltr': { |
- 'wrap': { |
- 'flex-start': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 40, 10], |
- 'child2': [20, 10, 20, 10], |
- 'child3': [40, 10, 40, 0], |
- 'child4': [20, 10, 20, 0], |
- }, |
- 'flex-end': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 20, 10], |
- 'child2': [20, 10, 0, 10], |
- 'child3': [40, 10, 20, 0], |
- 'child4': [20, 10, 0, 0], |
- }, |
- 'center': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 30, 10], |
- 'child2': [20, 10, 10, 10], |
- 'child3': [40, 10, 30, 0], |
- 'child4': [20, 10, 10, 0], |
- }, |
- 'space-between': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 40, 10], |
- 'child2': [20, 10, 0, 10], |
- 'child3': [40, 10, 40, 0], |
- 'child4': [20, 10, 0, 0], |
- }, |
- 'space-around': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 35, 10], |
- 'child2': [20, 10, 5, 10], |
- 'child3': [40, 10, 35, 0], |
- 'child4': [20, 10, 5, 0], |
- }, |
- }, |
- 'wrap-reverse': { |
- 'flex-start': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 40, 0], |
- 'child2': [20, 10, 20, 0], |
- 'child3': [40, 10, 40, 10], |
- 'child4': [20, 10, 20, 10], |
- }, |
- 'flex-end': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 20, 0], |
- 'child2': [20, 10, 0, 0], |
- 'child3': [40, 10, 20, 10], |
- 'child4': [20, 10, 0, 10], |
- }, |
- 'center': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 30, 0], |
- 'child2': [20, 10, 10, 0], |
- 'child3': [40, 10, 30, 10], |
- 'child4': [20, 10, 10, 10], |
- }, |
- 'space-between': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 40, 0], |
- 'child2': [20, 10, 0, 0], |
- 'child3': [40, 10, 40, 10], |
- 'child4': [20, 10, 0, 10], |
- }, |
- 'space-around': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 35, 0], |
- 'child2': [20, 10, 5, 0], |
- 'child3': [40, 10, 35, 10], |
- 'child4': [20, 10, 5, 10], |
- }, |
- }, |
- }, |
- 'rtl': { |
- 'wrap': { |
- 'flex-start': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 0, 10], |
- 'child2': [20, 10, 40, 10], |
- 'child3': [40, 10, 0, 0], |
- 'child4': [20, 10, 40, 0], |
- }, |
- 'flex-end': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 20, 10], |
- 'child2': [20, 10, 60, 10], |
- 'child3': [40, 10, 20, 0], |
- 'child4': [20, 10, 60, 0], |
- }, |
- 'center': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 10, 10], |
- 'child2': [20, 10, 50, 10], |
- 'child3': [40, 10, 10, 0], |
- 'child4': [20, 10, 50, 0], |
- }, |
- 'space-between': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 0, 10], |
- 'child2': [20, 10, 60, 10], |
- 'child3': [40, 10, 0, 0], |
- 'child4': [20, 10, 60, 0], |
- }, |
- 'space-around': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 5, 10], |
- 'child2': [20, 10, 55, 10], |
- 'child3': [40, 10, 5, 0], |
- 'child4': [20, 10, 55, 0], |
- }, |
- }, |
- 'wrap-reverse': { |
- 'flex-start': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 0, 0], |
- 'child2': [20, 10, 40, 0], |
- 'child3': [40, 10, 0, 10], |
- 'child4': [20, 10, 40, 10], |
- }, |
- 'flex-end': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 20, 0], |
- 'child2': [20, 10, 60, 0], |
- 'child3': [40, 10, 20, 10], |
- 'child4': [20, 10, 60, 10], |
- }, |
- 'center': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 10, 0], |
- 'child2': [20, 10, 50, 0], |
- 'child3': [40, 10, 10, 10], |
- 'child4': [20, 10, 50, 10], |
- }, |
- 'space-between': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 0, 0], |
- 'child2': [20, 10, 60, 0], |
- 'child3': [40, 10, 0, 10], |
- 'child4': [20, 10, 60, 10], |
- }, |
- 'space-around': { |
- 'flexbox': [80, 20], |
- 'child1': [40, 10, 5, 0], |
- 'child2': [20, 10, 55, 0], |
- 'child3': [40, 10, 5, 10], |
- 'child4': [20, 10, 55, 10], |
- }, |
- }, |
- }, |
- }, |
- 'column-reverse': { |
- 'ltr': { |
- 'wrap': { |
- 'flex-start': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 0], |
- 'child2': [10, 20, 0, 40], |
- 'child3': [10, 40, 10, 0], |
- 'child4': [10, 20, 10, 40], |
- }, |
- 'flex-end': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 20], |
- 'child2': [10, 20, 0, 60], |
- 'child3': [10, 40, 10, 20], |
- 'child4': [10, 20, 10, 60], |
- }, |
- 'center': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 10], |
- 'child2': [10, 20, 0, 50], |
- 'child3': [10, 40, 10, 10], |
- 'child4': [10, 20, 10, 50], |
- }, |
- 'space-between': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 0], |
- 'child2': [10, 20, 0, 60], |
- 'child3': [10, 40, 10, 0], |
- 'child4': [10, 20, 10, 60], |
- }, |
- 'space-around': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 5], |
- 'child2': [10, 20, 0, 55], |
- 'child3': [10, 40, 10, 5], |
- 'child4': [10, 20, 10, 55], |
- }, |
- }, |
- 'wrap-reverse': { |
- 'flex-start': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 0], |
- 'child2': [10, 20, 90, 40], |
- 'child3': [10, 40, 80, 0], |
- 'child4': [10, 20, 80, 40], |
- }, |
- 'flex-end': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 20], |
- 'child2': [10, 20, 90, 60], |
- 'child3': [10, 40, 80, 20], |
- 'child4': [10, 20, 80, 60], |
- }, |
- 'center': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 10], |
- 'child2': [10, 20, 90, 50], |
- 'child3': [10, 40, 80, 10], |
- 'child4': [10, 20, 80, 50], |
- }, |
- 'space-between': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 0], |
- 'child2': [10, 20, 90, 60], |
- 'child3': [10, 40, 80, 0], |
- 'child4': [10, 20, 80, 60], |
- }, |
- 'space-around': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 5], |
- 'child2': [10, 20, 90, 55], |
- 'child3': [10, 40, 80, 5], |
- 'child4': [10, 20, 80, 55], |
- }, |
- }, |
- }, |
- 'rtl': { |
- 'wrap': { |
- 'flex-start': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 0], |
- 'child2': [10, 20, 90, 40], |
- 'child3': [10, 40, 80, 0], |
- 'child4': [10, 20, 80, 40], |
- }, |
- 'flex-end': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 20], |
- 'child2': [10, 20, 90, 60], |
- 'child3': [10, 40, 80, 20], |
- 'child4': [10, 20, 80, 60], |
- }, |
- 'center': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 10], |
- 'child2': [10, 20, 90, 50], |
- 'child3': [10, 40, 80, 10], |
- 'child4': [10, 20, 80, 50], |
- }, |
- 'space-between': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 0], |
- 'child2': [10, 20, 90, 60], |
- 'child3': [10, 40, 80, 0], |
- 'child4': [10, 20, 80, 60], |
- }, |
- 'space-around': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 90, 5], |
- 'child2': [10, 20, 90, 55], |
- 'child3': [10, 40, 80, 5], |
- 'child4': [10, 20, 80, 55], |
- }, |
- }, |
- 'wrap-reverse': { |
- 'flex-start': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 0], |
- 'child2': [10, 20, 0, 40], |
- 'child3': [10, 40, 10, 0], |
- 'child4': [10, 20, 10, 40], |
- }, |
- 'flex-end': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 20], |
- 'child2': [10, 20, 0, 60], |
- 'child3': [10, 40, 10, 20], |
- 'child4': [10, 20, 10, 60], |
- }, |
- 'center': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 10], |
- 'child2': [10, 20, 0, 50], |
- 'child3': [10, 40, 10, 10], |
- 'child4': [10, 20, 10, 50], |
- }, |
- 'space-between': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 0], |
- 'child2': [10, 20, 0, 60], |
- 'child3': [10, 40, 10, 0], |
- 'child4': [10, 20, 10, 60], |
- }, |
- 'space-around': { |
- 'flexbox': [100, 80], |
- 'child1': [10, 40, 0, 5], |
- 'child2': [10, 20, 0, 55], |
- 'child3': [10, 40, 10, 5], |
- 'child4': [10, 20, 10, 55], |
- }, |
- }, |
- }, |
- }, |
- }, |
'vertical-rl': { |
'row': { |
'ltr': { |
@@ -2579,7 +1958,7 @@ function addChild(flexbox, mainAxis, crossAxis, preferredSize, crossAxisLength, |
flexbox.appendChild(child); |
} |
-var writingModes = ['horizontal-tb', 'horizontal-bt', 'vertical-rl', 'vertical-lr']; |
+var writingModes = ['horizontal-tb', 'vertical-rl', 'vertical-lr']; |
var flexDirections = ['row', 'column', 'row-reverse', 'column-reverse']; |
var directions = ['ltr', 'rtl']; |
var wraps = ['wrap', 'wrap-reverse']; |