Changeset 105015 in webkit
- Timestamp:
- Jan 13, 2012 7:03:08 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r105011 r105015 1 2012-01-13 Ojan Vafai <ojan@chromium.org> 2 3 Implement flex-align 4 https://bugs.webkit.org/show_bug.cgi?id=75782 5 6 Reviewed by Tony Chang. 7 8 * css3/flexbox/css-properties-expected.txt: 9 * css3/flexbox/flex-align-expected.txt: 10 * css3/flexbox/flex-align.html: 11 * css3/flexbox/script-tests/css-properties.js: 12 * fast/css/getComputedStyle/computed-style-expected.txt: 13 * platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt: 14 * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt: 15 * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 16 * platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt: 17 * platform/gtk/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 18 * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 19 * platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 20 * svg/css/getComputedStyle-basic-expected.txt: 21 1 22 2012-01-13 Vincent Scheib <scheib@chromium.org> 2 23 -
trunk/LayoutTests/css3/flexbox/css-properties-expected.txt
r104985 r105015 30 30 PASS window.getComputedStyle(flexbox, null).webkitFlexPack is "start" 31 31 PASS flexbox.style.webkitFlexItemAlign is "" 32 PASS window.getComputedStyle(flexbox, null).webkitFlexItemAlign is "stretch" 32 FAIL window.getComputedStyle(flexbox, null).webkitFlexItemAlign should be stretch. Was auto. 33 33 PASS flexbox.style.webkitFlexItemAlign is "" 34 PASS flexbox.style.webkitFlexItemAlign is "auto" 35 FAIL window.getComputedStyle(flexbox, null).webkitFlexItemAlign should be stretch. Was auto. 34 36 PASS flexbox.style.webkitFlexItemAlign is "start" 35 37 PASS window.getComputedStyle(flexbox, null).webkitFlexItemAlign is "start" … … 43 45 PASS window.getComputedStyle(flexbox, null).webkitFlexItemAlign is "baseline" 44 46 PASS flexbox.style.webkitFlexItemAlign is "" 45 PASS window.getComputedStyle(flexbox, null).webkitFlexItemAlign is "stretch" 47 FAIL window.getComputedStyle(flexbox, null).webkitFlexItemAlign should be stretch. Was auto. 48 PASS flexbox.style.webkitFlexAlign is "" 49 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "stretch" 50 FAIL window.getComputedStyle(flexitem, null).webkitFlexItemAlign should be stretch. Was auto. 51 PASS flexbox.style.webkitFlexAlign is "" 52 PASS flexbox.style.webkitFlexAlign is "" 53 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "stretch" 54 FAIL window.getComputedStyle(flexitem, null).webkitFlexItemAlign should be stretch. Was auto. 55 PASS flexbox.style.webkitFlexAlign is "start" 56 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "start" 57 FAIL window.getComputedStyle(flexitem, null).webkitFlexItemAlign should be start. Was auto. 58 PASS flexbox.style.webkitFlexAlign is "end" 59 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "end" 60 FAIL window.getComputedStyle(flexitem, null).webkitFlexItemAlign should be end. Was auto. 61 PASS flexbox.style.webkitFlexAlign is "center" 62 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "center" 63 FAIL window.getComputedStyle(flexitem, null).webkitFlexItemAlign should be center. Was auto. 64 PASS flexbox.style.webkitFlexAlign is "stretch" 65 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "stretch" 66 FAIL window.getComputedStyle(flexitem, null).webkitFlexItemAlign should be stretch. Was auto. 67 PASS flexbox.style.webkitFlexAlign is "baseline" 68 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "baseline" 69 FAIL window.getComputedStyle(flexitem, null).webkitFlexItemAlign should be baseline. Was auto. 70 PASS flexbox.style.webkitFlexAlign is "" 71 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "stretch" 72 FAIL window.getComputedStyle(flexitem, null).webkitFlexItemAlign should be stretch. Was auto. 73 PASS flexbox.style.webkitFlexAlign is "" 74 PASS window.getComputedStyle(flexbox, null).webkitFlexAlign is "stretch" 75 FAIL window.getComputedStyle(flexitem, null).webkitFlexItemAlign should be stretch. Was auto. 76 PASS window.getComputedStyle(detachedFlexbox, null).webkitFlexItemAlign is "" 77 PASS window.getComputedStyle(detachedFlexItem, null).webkitFlexItemAlign is "" 46 78 PASS flexbox.style.webkitFlexDirection is "" 47 79 PASS window.getComputedStyle(flexbox, null).webkitFlexDirection is "row" -
trunk/LayoutTests/css3/flexbox/flex-align-expected.txt
r104985 r105015 1 PASS 2 PASS 3 PASS 4 PASS 5 PASS 6 PASS 7 PASS 8 PASS 9 PASS 10 PASS 1 11 PASS 2 12 PASS -
trunk/LayoutTests/css3/flexbox/flex-align.html
r104985 r105015 11 11 position: relative; 12 12 } 13 .flexbox div {13 .flexbox > div { 14 14 border: 0; 15 15 } … … 68 68 </div> 69 69 70 <div class="flexbox" style="-webkit-flex-align: start"> 71 <div data-expected-height="0" data-offset-y="0" style="width: -webkit-flex(1 0 0);"></div> 72 <div data-expected-height="100" data-offset-y="0" style="width: -webkit-flex(1 0 0); height: 100px;"></div> 73 </div> 74 75 <div class="flexbox" style="-webkit-flex-align: end"> 76 <div data-expected-height="0" data-offset-y="100" style="width: -webkit-flex(1 0 0);"></div> 77 <div data-expected-height="100" data-offset-y="0" style="width: -webkit-flex(1 0 0); height: 100px;"></div> 78 </div> 79 80 <div class="flexbox" style="-webkit-flex-align: center"> 81 <div data-expected-height="0" data-offset-y="50" style="width: -webkit-flex(1 0 0);"></div> 82 <div data-expected-height="100" data-offset-y="0" style="width: -webkit-flex(1 0 0); height: 100px;"></div> 83 </div> 84 85 <div class="flexbox" style="-webkit-flex-align: baseline"> 86 <div style="width: -webkit-flex(1 0 0);"><div style="display:inline-block;"></div></div> 87 <div data-expected-height="100" data-offset-y="0" style="width: -webkit-flex(1 0 0); height: 100px;"></div> 88 </div> 89 90 <div class="flexbox" style="-webkit-flex-align: stretch"> 91 <div data-expected-height="100" data-offset-y="0" style="width: -webkit-flex(1 0 0);"></div> 92 <div data-expected-height="100" data-offset-y="0" style="width: -webkit-flex(1 0 0); height: 100px;"></div> 93 </div> 94 95 <div class="flexbox" style="-webkit-flex-align: start"> 96 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: auto; width: -webkit-flex(1 0 0); height: 100px;"></div> 97 <div data-expected-height="0" data-offset-y="0" style="-webkit-flex-item-align: auto; width: -webkit-flex(1 0 0);"></div> 98 <div data-expected-height="0" data-offset-y="0" style="-webkit-flex-item-align: start; width: -webkit-flex(1 0 0);"></div> 99 <div data-expected-height="0" data-offset-y="100" style="-webkit-flex-item-align: end; width: -webkit-flex(1 0 0);"></div> 100 <div data-expected-height="0" data-offset-y="50" style="-webkit-flex-item-align: center; width: -webkit-flex(1 0 0);"></div> 101 <div data-offset-y="20" style="-webkit-flex-item-align: baseline; width: -webkit-flex(1 0 0);"><div style="display:inline-block;"></div></div> 102 <div data-offset-y="20" style="-webkit-flex-item-align: baseline; width: -webkit-flex(1 0 0); margin: 20px;"><div style="display:inline-block;"></div></div> 103 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: stretch; width: -webkit-flex(1 0 0);"></div> 104 </div> 105 106 <div class="flexbox" style="-webkit-flex-align: end"> 107 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: auto; width: -webkit-flex(1 0 0); height: 100px;"></div> 108 <div data-expected-height="0" data-offset-y="100" style="-webkit-flex-item-align: auto; width: -webkit-flex(1 0 0);"></div> 109 <div data-expected-height="0" data-offset-y="0" style="-webkit-flex-item-align: start; width: -webkit-flex(1 0 0);"></div> 110 <div data-expected-height="0" data-offset-y="100" style="-webkit-flex-item-align: end; width: -webkit-flex(1 0 0);"></div> 111 <div data-expected-height="0" data-offset-y="50" style="-webkit-flex-item-align: center; width: -webkit-flex(1 0 0);"></div> 112 <div data-offset-y="20" style="-webkit-flex-item-align: baseline; width: -webkit-flex(1 0 0);"><div style="display:inline-block;"></div></div> 113 <div data-offset-y="20" style="-webkit-flex-item-align: baseline; width: -webkit-flex(1 0 0); margin: 20px;"><div style="display:inline-block;"></div></div> 114 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: stretch; width: -webkit-flex(1 0 0);"></div> 115 </div> 116 117 <div class="flexbox" style="-webkit-flex-align: center"> 118 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: auto; width: -webkit-flex(1 0 0); height: 100px;"></div> 119 <div data-expected-height="0" data-offset-y="50" style="-webkit-flex-item-align: auto; width: -webkit-flex(1 0 0);"></div> 120 <div data-expected-height="0" data-offset-y="0" style="-webkit-flex-item-align: start; width: -webkit-flex(1 0 0);"></div> 121 <div data-expected-height="0" data-offset-y="100" style="-webkit-flex-item-align: end; width: -webkit-flex(1 0 0);"></div> 122 <div data-expected-height="0" data-offset-y="50" style="-webkit-flex-item-align: center; width: -webkit-flex(1 0 0);"></div> 123 <div data-offset-y="20" style="-webkit-flex-item-align: baseline; width: -webkit-flex(1 0 0);"><div style="display:inline-block;"></div></div> 124 <div data-offset-y="20" style="-webkit-flex-item-align: baseline; width: -webkit-flex(1 0 0); margin: 20px;"><div style="display:inline-block;"></div></div> 125 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: stretch; width: -webkit-flex(1 0 0);"></div> 126 </div> 127 128 <div class="flexbox" style="-webkit-flex-align: baseline"> 129 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: start; width: -webkit-flex(1 0 0); height: 100px;"></div> 130 <div data-offset-y="20" style="-webkit-flex-item-align: auto; width: -webkit-flex(1 0 0);"><div style="display:inline-block;"></div></div> 131 <div data-expected-height="0" data-offset-y="0" style="-webkit-flex-item-align: start; width: -webkit-flex(1 0 0);"></div> 132 <div data-expected-height="0" data-offset-y="100" style="-webkit-flex-item-align: end; width: -webkit-flex(1 0 0);"></div> 133 <div data-expected-height="0" data-offset-y="50" style="-webkit-flex-item-align: center; width: -webkit-flex(1 0 0);"></div> 134 <div data-offset-y="20" style="-webkit-flex-item-align: baseline; width: -webkit-flex(1 0 0);"><div style="display:inline-block;"></div></div> 135 <div data-offset-y="20" style="-webkit-flex-item-align: baseline; width: -webkit-flex(1 0 0); margin: 20px;"><div style="display:inline-block;"></div></div> 136 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: stretch; width: -webkit-flex(1 0 0);"></div> 137 </div> 138 139 <div class="flexbox" style="-webkit-flex-align: stretch"> 140 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: auto; width: -webkit-flex(1 0 0); height: 100px;"></div> 141 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: auto; width: -webkit-flex(1 0 0);"></div> 142 <div data-expected-height="0" data-offset-y="0" style="-webkit-flex-item-align: start; width: -webkit-flex(1 0 0);"></div> 143 <div data-expected-height="0" data-offset-y="100" style="-webkit-flex-item-align: end; width: -webkit-flex(1 0 0);"></div> 144 <div data-expected-height="0" data-offset-y="50" style="-webkit-flex-item-align: center; width: -webkit-flex(1 0 0);"></div> 145 <div data-offset-y="20" style="-webkit-flex-item-align: baseline; width: -webkit-flex(1 0 0);"><div style="display:inline-block;"></div></div> 146 <div data-offset-y="20" style="-webkit-flex-item-align: baseline; width: -webkit-flex(1 0 0); margin: 20px;"><div style="display:inline-block;"></div></div> 147 <div data-expected-height="100" data-offset-y="0" style="-webkit-flex-item-align: stretch; width: -webkit-flex(1 0 0);"></div> 148 </div> 149 70 150 <div class="flexbox" style="height: 100px;"> 71 151 <div data-expected-height="50" data-offset-y="0" style="width: -webkit-flex(1 0 0); height: 50px;"></div> … … 137 217 <div class="flexbox"> 138 218 <div data-expected-height="20" data-offset-y="20" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline; height: 20px;"></div> 219 <!-- FIXME: This looks like it might be positioned 10 pixels too high due the margin-bottom. All the boxes should have their bottoms aligned I think. --> 139 220 <div data-expected-height="10" data-offset-y="20" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline; height: 10px; margin: 20px 0 10px;"></div> 140 221 <div data-expected-height="10" data-offset-y="30" style="width: -webkit-flex(1 0 0); -webkit-flex-item-align: baseline; height: 10px; margin: 20px 0 0;"></div> -
trunk/LayoutTests/css3/flexbox/script-tests/css-properties.js
r104985 r105015 77 77 shouldBeEqualToString('flexbox.style.webkitFlexItemAlign', ''); 78 78 79 flexbox.style.webkitFlexItemAlign = 'auto'; 80 shouldBeEqualToString('flexbox.style.webkitFlexItemAlign', 'auto'); 81 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexItemAlign', 'stretch'); 82 79 83 flexbox.style.webkitFlexItemAlign = 'start'; 80 84 shouldBeEqualToString('flexbox.style.webkitFlexItemAlign', 'start'); … … 100 104 shouldBeEqualToString('flexbox.style.webkitFlexItemAlign', ''); 101 105 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexItemAlign', 'stretch'); 106 107 shouldBeEqualToString('flexbox.style.webkitFlexAlign', ''); 108 // The initial value is 'stretch'. 109 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'stretch'); 110 shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitFlexItemAlign', 'stretch'); 111 112 flexbox.style.webkitFlexAlign = 'foo'; 113 shouldBeEqualToString('flexbox.style.webkitFlexAlign', ''); 114 115 flexbox.style.webkitFlexAlign = 'auto'; 116 shouldBeEqualToString('flexbox.style.webkitFlexAlign', ''); 117 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'stretch'); 118 shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitFlexItemAlign', 'stretch'); 119 120 flexbox.style.webkitFlexAlign = 'start'; 121 shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'start'); 122 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'start'); 123 shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitFlexItemAlign', 'start'); 124 125 flexbox.style.webkitFlexAlign = 'end'; 126 shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'end'); 127 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'end'); 128 shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitFlexItemAlign', 'end'); 129 130 flexbox.style.webkitFlexAlign = 'center'; 131 shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'center'); 132 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'center'); 133 shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitFlexItemAlign', 'center'); 134 135 flexbox.style.webkitFlexAlign = 'stretch'; 136 shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'stretch'); 137 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'stretch'); 138 shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitFlexItemAlign', 'stretch'); 139 140 flexbox.style.webkitFlexAlign = 'baseline'; 141 shouldBeEqualToString('flexbox.style.webkitFlexAlign', 'baseline'); 142 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'baseline'); 143 shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitFlexItemAlign', 'baseline'); 144 145 flexbox.style.webkitFlexAlign = ''; 146 shouldBeEqualToString('flexbox.style.webkitFlexAlign', ''); 147 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'stretch'); 148 shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitFlexItemAlign', 'stretch'); 149 150 flexbox.style.display = 'none'; 151 shouldBeEqualToString('flexbox.style.webkitFlexAlign', ''); 152 shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitFlexAlign', 'stretch'); 153 shouldBeEqualToString('window.getComputedStyle(flexitem, null).webkitFlexItemAlign', 'stretch'); 154 flexbox.style.display = ''; 155 156 157 // FIXME: This should probably return stretch. See https://bugs.webkit.org/show_bug.cgi?id=14563. 158 var detachedFlexbox = document.createElement('div'); 159 var detachedFlexItem = document.createElement('div'); 160 detachedFlexbox.appendChild(detachedFlexItem); 161 shouldBeEqualToString('window.getComputedStyle(detachedFlexbox, null).webkitFlexItemAlign', ''); 162 shouldBeEqualToString('window.getComputedStyle(detachedFlexItem, null).webkitFlexItemAlign', ''); 163 102 164 103 165 shouldBeEqualToString('flexbox.style.webkitFlexDirection', ''); -
trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
r104985 r105015 145 145 -webkit-flex-order: 0; 146 146 -webkit-flex-pack: start; 147 -webkit-flex-item-align: stretch; 147 -webkit-flex-align: stretch; 148 -webkit-flex-item-align: auto; 148 149 -webkit-flex-direction: row; 149 150 -webkit-flex-flow: row nowrap; -
trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt
r104985 r105015 287 287 rect: style.getPropertyValue(-webkit-flex-pack) : start 288 288 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] 289 rect: style.getPropertyValue(-webkit-flex-item-align) : stretch 289 rect: style.getPropertyValue(-webkit-flex-align) : stretch 290 rect: style.getPropertyCSSValue(-webkit-flex-align) : [object CSSPrimitiveValue] 291 rect: style.getPropertyValue(-webkit-flex-item-align) : auto 290 292 rect: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue] 291 293 rect: style.getPropertyValue(-webkit-flex-direction) : row … … 799 801 g: style.getPropertyValue(-webkit-flex-pack) : start 800 802 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] 801 g: style.getPropertyValue(-webkit-flex-item-align) : stretch 803 g: style.getPropertyValue(-webkit-flex-align) : stretch 804 g: style.getPropertyCSSValue(-webkit-flex-align) : [object CSSPrimitiveValue] 805 g: style.getPropertyValue(-webkit-flex-item-align) : auto 802 806 g: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue] 803 807 g: style.getPropertyValue(-webkit-flex-direction) : row -
trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt
r104985 r105015 145 145 -webkit-flex-order: 0; 146 146 -webkit-flex-pack: start; 147 -webkit-flex-item-align: stretch; 147 -webkit-flex-align: stretch; 148 -webkit-flex-item-align: auto; 148 149 -webkit-flex-direction: row; 149 150 -webkit-flex-flow: row nowrap; -
trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r104985 r105015 144 144 -webkit-flex-order: 0 145 145 -webkit-flex-pack: start 146 -webkit-flex-item-align: stretch 146 -webkit-flex-align: stretch 147 -webkit-flex-item-align: auto 147 148 -webkit-flex-direction: row 148 149 -webkit-flex-flow: row nowrap -
trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt
r104985 r105015 287 287 rect: style.getPropertyValue(-webkit-flex-pack) : start 288 288 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] 289 rect: style.getPropertyValue(-webkit-flex-item-align) : stretch 289 rect: style.getPropertyValue(-webkit-flex-align) : stretch 290 rect: style.getPropertyCSSValue(-webkit-flex-align) : [object CSSPrimitiveValue] 291 rect: style.getPropertyValue(-webkit-flex-item-align) : auto 290 292 rect: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue] 291 293 rect: style.getPropertyValue(-webkit-flex-direction) : row … … 799 801 g: style.getPropertyValue(-webkit-flex-pack) : start 800 802 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] 801 g: style.getPropertyValue(-webkit-flex-item-align) : stretch 803 g: style.getPropertyValue(-webkit-flex-align) : stretch 804 g: style.getPropertyCSSValue(-webkit-flex-align) : [object CSSPrimitiveValue] 805 g: style.getPropertyValue(-webkit-flex-item-align) : auto 802 806 g: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue] 803 807 g: style.getPropertyValue(-webkit-flex-direction) : row -
trunk/LayoutTests/platform/gtk/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r104985 r105015 144 144 -webkit-flex-order: 0 145 145 -webkit-flex-pack: start 146 -webkit-flex-item-align: stretch 146 -webkit-flex-align: stretch 147 -webkit-flex-item-align: auto 147 148 -webkit-flex-direction: row 148 149 -webkit-flex-flow: row nowrap -
trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r104985 r105015 144 144 -webkit-flex-order: 0 145 145 -webkit-flex-pack: start 146 -webkit-flex-item-align: stretch 146 -webkit-flex-align: stretch 147 -webkit-flex-item-align: auto 147 148 -webkit-flex-direction: row 148 149 -webkit-flex-flow: row nowrap -
trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r104985 r105015 144 144 -webkit-flex-order: 0 145 145 -webkit-flex-pack: start 146 -webkit-flex-item-align: stretch 146 -webkit-flex-align: stretch 147 -webkit-flex-item-align: auto 147 148 -webkit-flex-direction: row 148 149 -webkit-flex-flow: row nowrap -
trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
r104985 r105015 287 287 rect: style.getPropertyValue(-webkit-flex-pack) : start 288 288 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] 289 rect: style.getPropertyValue(-webkit-flex-item-align) : stretch 289 rect: style.getPropertyValue(-webkit-flex-align) : stretch 290 rect: style.getPropertyCSSValue(-webkit-flex-align) : [object CSSPrimitiveValue] 291 rect: style.getPropertyValue(-webkit-flex-item-align) : auto 290 292 rect: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue] 291 293 rect: style.getPropertyValue(-webkit-flex-direction) : row … … 799 801 g: style.getPropertyValue(-webkit-flex-pack) : start 800 802 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] 801 g: style.getPropertyValue(-webkit-flex-item-align) : stretch 803 g: style.getPropertyValue(-webkit-flex-align) : stretch 804 g: style.getPropertyCSSValue(-webkit-flex-align) : [object CSSPrimitiveValue] 805 g: style.getPropertyValue(-webkit-flex-item-align) : auto 802 806 g: style.getPropertyCSSValue(-webkit-flex-item-align) : [object CSSPrimitiveValue] 803 807 g: style.getPropertyValue(-webkit-flex-direction) : row -
trunk/Source/WebCore/ChangeLog
r105013 r105015 1 2012-01-13 Ojan Vafai <ojan@chromium.org> 2 3 Implement flex-align 4 https://bugs.webkit.org/show_bug.cgi?id=75782 5 6 Reviewed by Tony Chang. 7 8 * css/CSSComputedStyleDeclaration.cpp: 9 (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): 10 Intentially gets computed style for flex-item-align:auto wrong. 11 Will fix this in a followup patch. 12 * css/CSSParser.cpp: 13 (WebCore::CSSParser::parseValue): 14 * css/CSSProperty.cpp: 15 (WebCore::CSSProperty::isInheritedProperty): 16 * css/CSSPropertyNames.in: 17 * css/CSSStyleApplyProperty.cpp: 18 (WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty): 19 * css/CSSStyleSelector.cpp: 20 (WebCore::CSSStyleSelector::applyProperty): 21 * rendering/RenderBox.cpp: 22 (WebCore::RenderBox::sizesToIntrinsicLogicalWidth): 23 * rendering/RenderFlexibleBox.cpp: 24 (WebCore::flexAlignForChild): 25 (WebCore::RenderFlexibleBox::layoutAndPlaceChildren): 26 (WebCore::RenderFlexibleBox::alignChildren): 27 * rendering/style/RenderStyle.h: 28 (WebCore::RenderStyleBitfields::flexAlign): 29 (WebCore::RenderStyleBitfields::setFlexAlign): 30 (WebCore::RenderStyleBitfields::initialFlexAlign): 31 (WebCore::RenderStyleBitfields::initialFlexItemAlign): 32 * rendering/style/StyleFlexibleBoxData.cpp: 33 (WebCore::StyleFlexibleBoxData::StyleFlexibleBoxData): 34 (WebCore::StyleFlexibleBoxData::operator==): 35 * rendering/style/StyleFlexibleBoxData.h: 36 1 37 2012-01-13 Brent Fulgham <bfulgham@webkit.org> 2 38 -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r104985 r105015 219 219 CSSPropertyWebkitFlexOrder, 220 220 CSSPropertyWebkitFlexPack, 221 CSSPropertyWebkitFlexAlign, 221 222 CSSPropertyWebkitFlexItemAlign, 222 223 CSSPropertyWebkitFlexDirection, … … 1527 1528 case CSSPropertyWebkitFlexPack: 1528 1529 return cssValuePool->createValue(style->flexPack()); 1530 case CSSPropertyWebkitFlexAlign: 1531 return cssValuePool->createValue(style->flexAlign()); 1529 1532 case CSSPropertyWebkitFlexItemAlign: 1533 // FIXME: If flex-item-align:auto, then we should return the parent's flex-align. 1534 // http://webkit.org/b/76326 1530 1535 return cssValuePool->createValue(style->flexItemAlign()); 1531 1536 case CSSPropertyWebkitFlexDirection: -
trunk/Source/WebCore/css/CSSParser.cpp
r104985 r105015 1637 1637 case CSSPropertyWebkitFlexPack: 1638 1638 validPrimitive = id == CSSValueStart || id == CSSValueEnd || id == CSSValueCenter || id == CSSValueJustify; 1639 break; 1640 case CSSPropertyWebkitFlexAlign: 1641 validPrimitive = id == CSSValueStart || id == CSSValueEnd || id == CSSValueCenter || id == CSSValueBaseline || id == CSSValueStretch; 1639 1642 break; 1640 1643 case CSSPropertyWebkitFlexItemAlign: -
trunk/Source/WebCore/css/CSSProperty.cpp
r104985 r105015 561 561 case CSSPropertyWebkitFlexOrder: 562 562 case CSSPropertyWebkitFlexPack: 563 case CSSPropertyWebkitFlexAlign: 563 564 case CSSPropertyWebkitFlexItemAlign: 564 565 case CSSPropertyWebkitFlexDirection: -
trunk/Source/WebCore/css/CSSPropertyNames.in
r104985 r105015 256 256 -webkit-filter 257 257 #endif 258 -webkit-flex-align 258 259 -webkit-flex-direction 259 260 -webkit-flex-flow -
trunk/Source/WebCore/css/CSSStyleApplyProperty.cpp
r104985 r105015 1757 1757 setPropertyHandler(CSSPropertyWebkitFlexOrder, ApplyPropertyDefault<int, &RenderStyle::flexOrder, int, &RenderStyle::setFlexOrder, int, &RenderStyle::initialFlexOrder>::createHandler()); 1758 1758 setPropertyHandler(CSSPropertyWebkitFlexPack, ApplyPropertyDefault<EFlexPack, &RenderStyle::flexPack, EFlexPack, &RenderStyle::setFlexPack, EFlexPack, &RenderStyle::initialFlexPack>::createHandler()); 1759 setPropertyHandler(CSSPropertyWebkitFlexAlign, ApplyPropertyDefault<EFlexAlign, &RenderStyle::flexAlign, EFlexAlign, &RenderStyle::setFlexAlign, EFlexAlign, &RenderStyle::initialFlexAlign>::createHandler()); 1759 1760 setPropertyHandler(CSSPropertyWebkitFlexItemAlign, ApplyPropertyDefault<EFlexAlign, &RenderStyle::flexItemAlign, EFlexAlign, &RenderStyle::setFlexItemAlign, EFlexAlign, &RenderStyle::initialFlexItemAlign>::createHandler()); 1760 1761 setPropertyHandler(CSSPropertyWebkitFlexDirection, ApplyPropertyDefault<EFlexDirection, &RenderStyle::flexDirection, EFlexDirection, &RenderStyle::setFlexDirection, EFlexDirection, &RenderStyle::initialFlexDirection>::createHandler()); -
trunk/Source/WebCore/css/CSSStyleSelector.cpp
r104985 r105015 3787 3787 case CSSPropertyWebkitFlexOrder: 3788 3788 case CSSPropertyWebkitFlexPack: 3789 case CSSPropertyWebkitFlexAlign: 3789 3790 case CSSPropertyWebkitFlexItemAlign: 3790 3791 case CSSPropertyWebkitFlexDirection: -
trunk/Source/WebCore/rendering/RenderBox.cpp
r104985 r105015 1794 1794 // In the case of columns that have a stretch alignment, we go ahead and layout at the 1795 1795 // stretched size to avoid an extra layout when applying alignment. 1796 if (parent()->isFlexibleBox() && (!parent()->style()->isColumnFlexDirection() || style()->flexItemAlign() != AlignStretch)) 1797 return true; 1796 if (parent()->isFlexibleBox()) { 1797 if (!parent()->style()->isColumnFlexDirection()) 1798 return true; 1799 EFlexAlign itemAlign = style()->flexItemAlign(); 1800 if (itemAlign != AlignStretch && (itemAlign != AlignAuto || parent()->style()->flexAlign() != AlignStretch)) 1801 return true; 1802 } 1798 1803 1799 1804 // Flexible horizontal boxes lay out children at their intrinsic widths. Also vertical boxes -
trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp
r104985 r105015 619 619 } 620 620 621 static EFlexAlign flexAlignForChild(RenderBox* child) 622 { 623 EFlexAlign align = child->style()->flexItemAlign(); 624 if (align == AlignAuto) 625 return child->parent()->style()->flexAlign(); 626 return align; 627 } 628 621 629 void RenderFlexibleBox::layoutAndPlaceChildren(FlexOrderIterator& iterator, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, float totalPositiveFlexibility) 622 630 { … … 640 648 child->layoutIfNeeded(); 641 649 642 if ( child->style()->flexItemAlign() == AlignBaseline) {650 if (flexAlignForChild(child) == AlignBaseline) { 643 651 LayoutUnit ascent = marginBoxAscent(child); 644 652 LayoutUnit descent = (crossAxisMarginExtentForChild(child) + crossAxisExtentForChild(child)) - ascent; … … 733 741 734 742 // FIXME: Make sure this does the right thing with column flows. 735 switch ( child->style()->flexItemAlign()) {743 switch (flexAlignForChild(child)) { 736 744 case AlignAuto: 737 // FIXME: Handle this once we add flex-align.745 ASSERT_NOT_REACHED(); 738 746 break; 739 747 case AlignStretch: { -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r104985 r105015 802 802 int flexOrder() const { return rareNonInheritedData->m_flexibleBox->m_flexOrder; } 803 803 EFlexPack flexPack() const { return static_cast<EFlexPack>(rareNonInheritedData->m_flexibleBox->m_flexPack); } 804 EFlexAlign flexAlign() const { return static_cast<EFlexAlign>(rareNonInheritedData->m_flexibleBox->m_flexAlign); } 804 805 EFlexAlign flexItemAlign() const { return static_cast<EFlexAlign>(rareNonInheritedData->m_flexibleBox->m_flexItemAlign); } 805 806 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(rareNonInheritedData->m_flexibleBox->m_flexDirection); } … … 1222 1223 void setFlexOrder(int o) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexOrder, o); } 1223 1224 void setFlexPack(EFlexPack p) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexPack, p); } 1225 void setFlexAlign(EFlexAlign a) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexAlign, a); } 1224 1226 void setFlexItemAlign(EFlexAlign a) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexItemAlign, a); } 1225 1227 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexDirection, direction); } … … 1546 1548 static int initialFlexOrder() { return 0; } 1547 1549 static EFlexPack initialFlexPack() { return PackStart; } 1548 // FIXME: When we add in flex-align, default flex-item-align to AlignAuto.1549 static EFlexAlign initialFlexItemAlign() { return Align Stretch; }1550 static EFlexAlign initialFlexAlign() { return AlignStretch; } 1551 static EFlexAlign initialFlexItemAlign() { return AlignAuto; } 1550 1552 static EFlexDirection initialFlexDirection() { return FlowRow; } 1551 1553 static EFlexWrap initialFlexWrap() { return FlexNoWrap; } -
trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp
r104985 r105015 38 38 , m_flexOrder(RenderStyle::initialFlexOrder()) 39 39 , m_flexPack(RenderStyle::initialFlexPack()) 40 , m_flexAlign(RenderStyle::initialFlexAlign()) 40 41 , m_flexItemAlign(RenderStyle::initialFlexItemAlign()) 41 42 , m_flexDirection(RenderStyle::initialFlexDirection()) … … 52 53 , m_flexOrder(o.m_flexOrder) 53 54 , m_flexPack(o.m_flexPack) 55 , m_flexAlign(o.m_flexAlign) 54 56 , m_flexItemAlign(o.m_flexItemAlign) 55 57 , m_flexDirection(o.m_flexDirection) … … 62 64 return m_widthPositiveFlex == o.m_widthPositiveFlex && m_widthNegativeFlex == o.m_widthNegativeFlex 63 65 && m_heightPositiveFlex == o.m_heightPositiveFlex && m_heightNegativeFlex == o.m_heightNegativeFlex 64 && m_flexOrder == o.m_flexOrder && m_flexPack == o.m_flexPack && m_flex ItemAlign == o.m_flexItemAlign65 && m_flex Direction == o.m_flexDirection && m_flexWrap == o.m_flexWrap;66 && m_flexOrder == o.m_flexOrder && m_flexPack == o.m_flexPack && m_flexAlign == o.m_flexAlign 67 && m_flexItemAlign == o.m_flexItemAlign && m_flexDirection == o.m_flexDirection && m_flexWrap == o.m_flexWrap; 66 68 } 67 69 -
trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.h
r104985 r105015 51 51 52 52 unsigned m_flexPack : 2; // EFlexPack 53 unsigned m_flexAlign : 3; // EFlexAlign 53 54 unsigned m_flexItemAlign : 3; // EFlexAlign 54 55 unsigned m_flexDirection : 2; // EFlexDirection
Note: See TracChangeset
for help on using the changeset viewer.