Changeset 119255 in webkit
- Timestamp:
- Jun 1, 2012 11:10:56 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 43 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r119254 r119255 1 2012-06-01 Tony Chang <tony@chromium.org> 2 3 rename -webkit-flex-order to -webkit-order 4 https://bugs.webkit.org/show_bug.cgi?id=88104 5 6 Reviewed by Ojan Vafai. 7 8 Just a find and replace for the new property name. 9 10 * css3/flexbox/css-properties-expected.txt: 11 * css3/flexbox/css-properties.html: 12 * css3/flexbox/flex-order.html: 13 * fast/css/getComputedStyle/computed-style-expected.txt: 14 * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 15 * platform/chromium-linux-x86/svg/css/getComputedStyle-basic-expected.txt: 16 * platform/chromium-linux/svg/css/getComputedStyle-basic-expected.txt: 17 * platform/chromium-mac-leopard/fast/css/getComputedStyle/computed-style-expected.txt: 18 * platform/chromium-mac-leopard/svg/css/getComputedStyle-basic-expected.txt: 19 * platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt: 20 * platform/chromium-mac/fast/css/getComputedStyle/computed-style-expected.txt: 21 * platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 22 * platform/chromium-mac/svg/css/getComputedStyle-basic-expected.txt: 23 * platform/chromium-win-vista/svg/css/getComputedStyle-basic-expected.txt: 24 * platform/chromium-win-xp/svg/css/getComputedStyle-basic-expected.txt: 25 * platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt: 26 * platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 27 * platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt: 28 * platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt: 29 * platform/gtk/svg/css/getComputedStyle-basic-expected.txt: 30 * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt: 31 * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 32 * platform/mac/svg/css/getComputedStyle-basic-expected.txt: 33 * platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 34 * platform/qt/svg/css/getComputedStyle-basic-expected.txt: 35 * platform/win/fast/css/getComputedStyle/computed-style-expected.txt: 36 * platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt: 37 * svg/css/getComputedStyle-basic-expected.txt: 38 1 39 2012-06-01 Florin Malita <fmalita@chromium.org> 2 40 -
trunk/LayoutTests/css3/flexbox/css-properties-expected.txt
r119131 r119255 9 9 PASS flexbox.style.display is "-webkit-inline-flex" 10 10 PASS flexbox.style.display is "block" 11 PASS flexitem.style.webkit FlexOrder is ""12 PASS flexitem.style.webkit FlexOrder is "2"13 PASS flexitem.style.webkit FlexOrder is "-1"14 PASS flexitem.style.webkit FlexOrder is "0"15 PASS flexitem.style.webkit FlexOrder is "0"16 PASS flexitem.style.webkit FlexOrder is "0"17 PASS flexitem.style.webkit FlexOrder is ""11 PASS flexitem.style.webkitOrder is "" 12 PASS flexitem.style.webkitOrder is "2" 13 PASS flexitem.style.webkitOrder is "-1" 14 PASS flexitem.style.webkitOrder is "0" 15 PASS flexitem.style.webkitOrder is "0" 16 PASS flexitem.style.webkitOrder is "0" 17 PASS flexitem.style.webkitOrder is "" 18 18 PASS flexbox.style.webkitFlexPack is "" 19 19 PASS window.getComputedStyle(flexbox, null).webkitFlexPack is "start" -
trunk/LayoutTests/css3/flexbox/css-properties.html
r119131 r119255 30 30 31 31 var flexitem = document.getElementById("flexitem"); 32 shouldBeEqualToString('flexitem.style.webkit FlexOrder', '');33 34 flexitem.style.webkit FlexOrder = 2;35 shouldBeEqualToString('flexitem.style.webkit FlexOrder', '2');36 37 flexitem.style.webkit FlexOrder = -1;38 shouldBeEqualToString('flexitem.style.webkit FlexOrder', '-1');39 40 flexitem.style.webkit FlexOrder = 0;41 shouldBeEqualToString('flexitem.style.webkit FlexOrder', '0');42 43 // -webkit- flex-order must be an integer.44 flexitem.style.webkit FlexOrder = 1.5;45 shouldBeEqualToString('flexitem.style.webkit FlexOrder', '0');46 47 flexitem.style.webkit FlexOrder = "test";48 shouldBeEqualToString('flexitem.style.webkit FlexOrder', '0');49 50 flexitem.style.webkit FlexOrder = '';51 shouldBeEqualToString('flexitem.style.webkit FlexOrder', '');32 shouldBeEqualToString('flexitem.style.webkitOrder', ''); 33 34 flexitem.style.webkitOrder = 2; 35 shouldBeEqualToString('flexitem.style.webkitOrder', '2'); 36 37 flexitem.style.webkitOrder = -1; 38 shouldBeEqualToString('flexitem.style.webkitOrder', '-1'); 39 40 flexitem.style.webkitOrder = 0; 41 shouldBeEqualToString('flexitem.style.webkitOrder', '0'); 42 43 // -webkit-order must be an integer. 44 flexitem.style.webkitOrder = 1.5; 45 shouldBeEqualToString('flexitem.style.webkitOrder', '0'); 46 47 flexitem.style.webkitOrder = "test"; 48 shouldBeEqualToString('flexitem.style.webkitOrder', '0'); 49 50 flexitem.style.webkitOrder = ''; 51 shouldBeEqualToString('flexitem.style.webkitOrder', ''); 52 52 53 53 -
trunk/LayoutTests/css3/flexbox/flex-order.html
r117385 r119255 34 34 35 35 <div style="display: -webkit-flex" class="horizontal-box"> 36 <div class="first" style="-webkit-flex: 1; -webkit- flex-order: 0"></div>36 <div class="first" style="-webkit-flex: 1; -webkit-order: 0"></div> 37 37 <div class="second" style="-webkit-flex: 1;"></div> 38 <div class="third" style="-webkit-flex: 1; -webkit- flex-order: 3"></div>39 <div class="fourth" style="-webkit-flex: 1; -webkit- flex-order: 20"></div>38 <div class="third" style="-webkit-flex: 1; -webkit-order: 3"></div> 39 <div class="fourth" style="-webkit-flex: 1; -webkit-order: 20"></div> 40 40 </div> 41 41 42 42 <div style="display: -webkit-flex" class="horizontal-box"> 43 <div class="fourth" style="-webkit-flex: 1; -webkit- flex-order: 4"></div>44 <div class="third" style="-webkit-flex: 1; -webkit- flex-order: 3"></div>45 <div class="second" style="-webkit-flex: 1; -webkit- flex-order: 2"></div>46 <div class="first" style="-webkit-flex: 1; -webkit- flex-order: 1"></div>43 <div class="fourth" style="-webkit-flex: 1; -webkit-order: 4"></div> 44 <div class="third" style="-webkit-flex: 1; -webkit-order: 3"></div> 45 <div class="second" style="-webkit-flex: 1; -webkit-order: 2"></div> 46 <div class="first" style="-webkit-flex: 1; -webkit-order: 1"></div> 47 47 </div> 48 48 49 49 <!-- The example from the spec. --> 50 50 <div style="display: -webkit-flex" class="horizontal-box"> 51 <div class="third" style="-webkit-flex: 1; -webkit- flex-order: 1"></div>51 <div class="third" style="-webkit-flex: 1; -webkit-order: 1"></div> 52 52 <div class="first" style="-webkit-flex: 1"></div> 53 <div class="fourth" style="-webkit-flex: 1; -webkit- flex-order: 1"></div>54 <div class="second" style="-webkit-flex: 1; -webkit- flex-order: 0"></div>53 <div class="fourth" style="-webkit-flex: 1; -webkit-order: 1"></div> 54 <div class="second" style="-webkit-flex: 1; -webkit-order: 0"></div> 55 55 </div> 56 56 57 57 <div style="display: -webkit-flex" class="horizontal-box"> 58 <div class="fourth" style="-webkit-flex: 1; -webkit- flex-order: 2"></div>58 <div class="fourth" style="-webkit-flex: 1; -webkit-order: 2"></div> 59 59 <div class="second" style="-webkit-flex: 1"></div> 60 60 <div class="third" style="-webkit-flex: 1"></div> 61 <div class="first" style="-webkit-flex: 1; -webkit- flex-order: -10"></div>61 <div class="first" style="-webkit-flex: 1; -webkit-order: -10"></div> 62 62 </div> 63 63 64 64 <div style="display: -webkit-flex" class="horizontal-box"> 65 <div class="fourth" style="-webkit-flex: 1; -webkit- flex-order: 2000000000"></div>66 <div class="second" style="-webkit-flex: 1; -webkit- flex-order: 1000000000"></div>67 <div class="third" style="-webkit-flex: 1; -webkit- flex-order: 1000000000"></div>68 <div class="first" style="-webkit-flex: 1; -webkit- flex-order: -1000000000"></div>65 <div class="fourth" style="-webkit-flex: 1; -webkit-order: 2000000000"></div> 66 <div class="second" style="-webkit-flex: 1; -webkit-order: 1000000000"></div> 67 <div class="third" style="-webkit-flex: 1; -webkit-order: 1000000000"></div> 68 <div class="first" style="-webkit-flex: 1; -webkit-order: -1000000000"></div> 69 69 </div> 70 70 71 71 <!-- Floating numbers are ignored and we use the default of 1 instead. --> 72 72 <div style="display: -webkit-flex" class="horizontal-box"> 73 <div class="second" style="-webkit-flex: 1; -webkit- flex-order: 2.5"></div>74 <div class="fourth" style="-webkit-flex: 1; -webkit- flex-order: 2"></div>75 <div class="first" style="-webkit-flex: 1; -webkit- flex-order: -1"></div>73 <div class="second" style="-webkit-flex: 1; -webkit-order: 2.5"></div> 74 <div class="fourth" style="-webkit-flex: 1; -webkit-order: 2"></div> 75 <div class="first" style="-webkit-flex: 1; -webkit-order: -1"></div> 76 76 <div class="third" style="-webkit-flex: 1"></div> 77 77 </div> 78 78 79 79 <div style="display: -webkit-flex" class="horizontal-box"> 80 <div class="second" style="-webkit-flex: 1; -webkit- flex-order: 0"></div>81 <div class="first" style="-webkit-flex: 1; -webkit- flex-order: -1"></div>82 <div class="fourth" style="-webkit-flex: 1; -webkit- flex-order: 1"></div>80 <div class="second" style="-webkit-flex: 1; -webkit-order: 0"></div> 81 <div class="first" style="-webkit-flex: 1; -webkit-order: -1"></div> 82 <div class="fourth" style="-webkit-flex: 1; -webkit-order: 1"></div> 83 83 <div class="third" style="-webkit-flex: 1"></div> 84 84 </div> … … 87 87 -2,147,483,646 (int min + 2) to 2,147,483,647. --> 88 88 <div style="display: -webkit-flex" class="horizontal-box"> 89 <div class="third" style="-webkit-flex: 1; -webkit- flex-order: 4000000000"></div>90 <div class="fourth" style="-webkit-flex: 1; -webkit- flex-order: 3000000000"></div>89 <div class="third" style="-webkit-flex: 1; -webkit-order: 4000000000"></div> 90 <div class="fourth" style="-webkit-flex: 1; -webkit-order: 3000000000"></div> 91 91 <div class="first" style="-webkit-flex: 1;"></div> 92 <div class="second" style="-webkit-flex: 1; -webkit- flex-order: 2147483646"></div>92 <div class="second" style="-webkit-flex: 1; -webkit-order: 2147483646"></div> 93 93 </div> 94 94 95 95 <div style="display: -webkit-flex" class="horizontal-box"> 96 <div class="second" style="-webkit-flex: 1; -webkit- flex-order: 4000000000"></div>97 <div class="third" style="-webkit-flex: 1; -webkit- flex-order: 3000000000"></div>96 <div class="second" style="-webkit-flex: 1; -webkit-order: 4000000000"></div> 97 <div class="third" style="-webkit-flex: 1; -webkit-order: 3000000000"></div> 98 98 <div class="first" style="-webkit-flex: 1;"></div> 99 <div class="fourth" style="-webkit-flex: 1; -webkit- flex-order: 2147483647"></div>99 <div class="fourth" style="-webkit-flex: 1; -webkit-order: 2147483647"></div> 100 100 </div> 101 101 102 102 <div style="display: -webkit-flex" class="horizontal-box"> 103 <div class="third" style="-webkit-flex: 1; -webkit- flex-order: -2147483645"></div>104 <div class="first" style="-webkit-flex: 1; -webkit- flex-order: -2147483646"></div>105 <div class="second" style="-webkit-flex: 1; -webkit- flex-order: -2147483647"></div>103 <div class="third" style="-webkit-flex: 1; -webkit-order: -2147483645"></div> 104 <div class="first" style="-webkit-flex: 1; -webkit-order: -2147483646"></div> 105 <div class="second" style="-webkit-flex: 1; -webkit-order: -2147483647"></div> 106 106 <div class="fourth" style="-webkit-flex: 1;"></div> 107 107 </div> -
trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt
r119191 r119255 149 149 -webkit-align-self: stretch; 150 150 -webkit-flex: 1 1 auto; 151 -webkit-flex-order: 0;152 151 -webkit-flex-pack: start; 153 152 -webkit-flex-direction: row; … … 194 193 -webkit-mask-size: auto; 195 194 -webkit-nbsp-mode: normal; 195 -webkit-order: 0; 196 196 -webkit-perspective: none; 197 197 -webkit-perspective-origin: 392px 288px; -
trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r119191 r119255 147 147 -webkit-align-self: stretch 148 148 -webkit-flex: 1 1 auto 149 -webkit-flex-order: 0150 149 -webkit-flex-pack: start 151 150 -webkit-flex-direction: row … … 192 191 -webkit-mask-size: auto 193 192 -webkit-nbsp-mode: normal 193 -webkit-order: 0 194 194 -webkit-perspective: none 195 195 -webkit-perspective-origin: 50% 50% -
trunk/LayoutTests/platform/chromium-linux-x86/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 295 295 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 296 296 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 297 rect: style.getPropertyValue(-webkit-flex-order) : 0298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]299 297 rect: style.getPropertyValue(-webkit-flex-pack) : start 300 298 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 385 383 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 384 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 385 rect: style.getPropertyValue(-webkit-order) : 0 386 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 387 387 rect: style.getPropertyValue(-webkit-perspective) : none 388 388 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 829 829 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 830 830 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 831 g: style.getPropertyValue(-webkit-flex-order) : 0832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]833 831 g: style.getPropertyValue(-webkit-flex-pack) : start 834 832 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 919 917 g: style.getPropertyValue(-webkit-nbsp-mode) : normal 920 918 g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 919 g: style.getPropertyValue(-webkit-order) : 0 920 g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 921 921 g: style.getPropertyValue(-webkit-perspective) : none 922 922 g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/chromium-linux/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 295 295 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 296 296 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 297 rect: style.getPropertyValue(-webkit-flex-order) : 0298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]299 297 rect: style.getPropertyValue(-webkit-flex-pack) : start 300 298 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 385 383 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 384 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 385 rect: style.getPropertyValue(-webkit-order) : 0 386 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 387 387 rect: style.getPropertyValue(-webkit-perspective) : none 388 388 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 829 829 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 830 830 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 831 g: style.getPropertyValue(-webkit-flex-order) : 0832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]833 831 g: style.getPropertyValue(-webkit-flex-pack) : start 834 832 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 919 917 g: style.getPropertyValue(-webkit-nbsp-mode) : normal 920 918 g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 919 g: style.getPropertyValue(-webkit-order) : 0 920 g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 921 921 g: style.getPropertyValue(-webkit-perspective) : none 922 922 g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/chromium-mac-leopard/fast/css/getComputedStyle/computed-style-expected.txt
r119191 r119255 149 149 -webkit-align-self: stretch; 150 150 -webkit-flex: 1 1 auto; 151 -webkit-flex-order: 0;152 151 -webkit-flex-pack: start; 153 152 -webkit-flex-direction: row; … … 194 193 -webkit-mask-size: auto; 195 194 -webkit-nbsp-mode: normal; 195 -webkit-order: 0; 196 196 -webkit-perspective: none; 197 197 -webkit-perspective-origin: 392px 288px; -
trunk/LayoutTests/platform/chromium-mac-leopard/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 295 295 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 296 296 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 297 rect: style.getPropertyValue(-webkit-flex-order) : 0298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]299 297 rect: style.getPropertyValue(-webkit-flex-pack) : start 300 298 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 385 383 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 384 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 385 rect: style.getPropertyValue(-webkit-order) : 0 386 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 387 387 rect: style.getPropertyValue(-webkit-perspective) : none 388 388 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 829 829 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 830 830 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 831 g: style.getPropertyValue(-webkit-flex-order) : 0832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]833 831 g: style.getPropertyValue(-webkit-flex-pack) : start 834 832 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 919 917 g: style.getPropertyValue(-webkit-nbsp-mode) : normal 920 918 g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 919 g: style.getPropertyValue(-webkit-order) : 0 920 g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 921 921 g: style.getPropertyValue(-webkit-perspective) : none 922 922 g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/chromium-mac-snowleopard/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 295 295 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 296 296 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 297 rect: style.getPropertyValue(-webkit-flex-order) : 0298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]299 297 rect: style.getPropertyValue(-webkit-flex-pack) : start 300 298 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 385 383 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 384 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 385 rect: style.getPropertyValue(-webkit-order) : 0 386 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 387 387 rect: style.getPropertyValue(-webkit-perspective) : none 388 388 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 829 829 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 830 830 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 831 g: style.getPropertyValue(-webkit-flex-order) : 0832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]833 831 g: style.getPropertyValue(-webkit-flex-pack) : start 834 832 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 919 917 g: style.getPropertyValue(-webkit-nbsp-mode) : normal 920 918 g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 919 g: style.getPropertyValue(-webkit-order) : 0 920 g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 921 921 g: style.getPropertyValue(-webkit-perspective) : none 922 922 g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-expected.txt
r119191 r119255 149 149 -webkit-align-self: stretch; 150 150 -webkit-flex: 1 1 auto; 151 -webkit-flex-order: 0;152 151 -webkit-flex-pack: start; 153 152 -webkit-flex-direction: row; … … 194 193 -webkit-mask-size: auto; 195 194 -webkit-nbsp-mode: normal; 195 -webkit-order: 0; 196 196 -webkit-perspective: none; 197 197 -webkit-perspective-origin: 392px 288px; -
trunk/LayoutTests/platform/chromium-mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r119191 r119255 148 148 -webkit-align-self: stretch 149 149 -webkit-flex: 1 1 auto 150 -webkit-flex-order: 0151 150 -webkit-flex-pack: start 152 151 -webkit-flex-direction: row … … 193 192 -webkit-mask-size: auto 194 193 -webkit-nbsp-mode: normal 194 -webkit-order: 0 195 195 -webkit-perspective: none 196 196 -webkit-perspective-origin: 50% 50% -
trunk/LayoutTests/platform/chromium-mac/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 295 295 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 296 296 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 297 rect: style.getPropertyValue(-webkit-flex-order) : 0298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]299 297 rect: style.getPropertyValue(-webkit-flex-pack) : start 300 298 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 385 383 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 384 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 385 rect: style.getPropertyValue(-webkit-order) : 0 386 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 387 387 rect: style.getPropertyValue(-webkit-perspective) : none 388 388 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 829 829 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 830 830 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 831 g: style.getPropertyValue(-webkit-flex-order) : 0832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]833 831 g: style.getPropertyValue(-webkit-flex-pack) : start 834 832 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 919 917 g: style.getPropertyValue(-webkit-nbsp-mode) : normal 920 918 g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 919 g: style.getPropertyValue(-webkit-order) : 0 920 g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 921 921 g: style.getPropertyValue(-webkit-perspective) : none 922 922 g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/chromium-win-vista/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 295 295 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 296 296 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 297 rect: style.getPropertyValue(-webkit-flex-order) : 0298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]299 297 rect: style.getPropertyValue(-webkit-flex-pack) : start 300 298 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 385 383 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 384 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 385 rect: style.getPropertyValue(-webkit-order) : 0 386 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 387 387 rect: style.getPropertyValue(-webkit-perspective) : none 388 388 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 829 829 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 830 830 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 831 g: style.getPropertyValue(-webkit-flex-order) : 0832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]833 831 g: style.getPropertyValue(-webkit-flex-pack) : start 834 832 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 919 917 g: style.getPropertyValue(-webkit-nbsp-mode) : normal 920 918 g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 919 g: style.getPropertyValue(-webkit-order) : 0 920 g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 921 921 g: style.getPropertyValue(-webkit-perspective) : none 922 922 g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/chromium-win-xp/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 295 295 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 296 296 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 297 rect: style.getPropertyValue(-webkit-flex-order) : 0298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]299 297 rect: style.getPropertyValue(-webkit-flex-pack) : start 300 298 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 385 383 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 384 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 385 rect: style.getPropertyValue(-webkit-order) : 0 386 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 387 387 rect: style.getPropertyValue(-webkit-perspective) : none 388 388 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 829 829 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 830 830 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 831 g: style.getPropertyValue(-webkit-flex-order) : 0832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]833 831 g: style.getPropertyValue(-webkit-flex-pack) : start 834 832 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 919 917 g: style.getPropertyValue(-webkit-nbsp-mode) : normal 920 918 g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 919 g: style.getPropertyValue(-webkit-order) : 0 920 g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 921 921 g: style.getPropertyValue(-webkit-perspective) : none 922 922 g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-expected.txt
r119191 r119255 149 149 -webkit-align-self: stretch; 150 150 -webkit-flex: 1 1 auto; 151 -webkit-flex-order: 0;152 151 -webkit-flex-pack: start; 153 152 -webkit-flex-direction: row; … … 194 193 -webkit-mask-size: auto; 195 194 -webkit-nbsp-mode: normal; 195 -webkit-order: 0; 196 196 -webkit-perspective: none; 197 197 -webkit-perspective-origin: 392px 288px; -
trunk/LayoutTests/platform/chromium-win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r119191 r119255 148 148 -webkit-align-self: stretch 149 149 -webkit-flex: 1 1 auto 150 -webkit-flex-order: 0151 150 -webkit-flex-pack: start 152 151 -webkit-flex-direction: row … … 193 192 -webkit-mask-size: auto 194 193 -webkit-nbsp-mode: normal 194 -webkit-order: 0 195 195 -webkit-perspective: none 196 196 -webkit-perspective-origin: 50% 50% -
trunk/LayoutTests/platform/chromium-win/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 295 295 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 296 296 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 297 rect: style.getPropertyValue(-webkit-flex-order) : 0298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]299 297 rect: style.getPropertyValue(-webkit-flex-pack) : start 300 298 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 385 383 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 384 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 385 rect: style.getPropertyValue(-webkit-order) : 0 386 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 387 387 rect: style.getPropertyValue(-webkit-perspective) : none 388 388 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 829 829 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 830 830 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 831 g: style.getPropertyValue(-webkit-flex-order) : 0832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]833 831 g: style.getPropertyValue(-webkit-flex-pack) : start 834 832 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 919 917 g: style.getPropertyValue(-webkit-nbsp-mode) : normal 920 918 g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 919 g: style.getPropertyValue(-webkit-order) : 0 920 g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 921 921 g: style.getPropertyValue(-webkit-perspective) : none 922 922 g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/gtk/fast/css/getComputedStyle/computed-style-expected.txt
r119191 r119255 148 148 -webkit-align-self: stretch; 149 149 -webkit-flex: 1 1 auto; 150 -webkit-flex-order: 0;151 150 -webkit-flex-pack: start; 152 151 -webkit-flex-direction: row; … … 193 192 -webkit-mask-size: auto; 194 193 -webkit-nbsp-mode: normal; 194 -webkit-order: 0; 195 195 -webkit-perspective: none; 196 196 -webkit-perspective-origin: 392px 288px; -
trunk/LayoutTests/platform/gtk/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 293 293 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 294 294 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 295 rect: style.getPropertyValue(-webkit-flex-order) : 0296 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]297 295 rect: style.getPropertyValue(-webkit-flex-pack) : start 298 296 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 383 381 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 384 382 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 383 rect: style.getPropertyValue(-webkit-order) : 0 384 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 385 385 rect: style.getPropertyValue(-webkit-perspective) : none 386 386 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 825 825 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 826 826 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 827 g: style.getPropertyValue(-webkit-flex-order) : 0828 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]829 827 g: style.getPropertyValue(-webkit-flex-pack) : start 830 828 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 915 913 g: style.getPropertyValue(-webkit-nbsp-mode) : normal 916 914 g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 915 g: style.getPropertyValue(-webkit-order) : 0 916 g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 917 917 g: style.getPropertyValue(-webkit-perspective) : none 918 918 g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt
r119191 r119255 149 149 -webkit-align-self: stretch; 150 150 -webkit-flex: 1 1 auto; 151 -webkit-flex-order: 0;152 151 -webkit-flex-pack: start; 153 152 -webkit-flex-direction: row; … … 194 193 -webkit-mask-size: auto; 195 194 -webkit-nbsp-mode: normal; 195 -webkit-order: 0; 196 196 -webkit-perspective: none; 197 197 -webkit-perspective-origin: 392px 288px; -
trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r119191 r119255 148 148 -webkit-align-self: stretch 149 149 -webkit-flex: 1 1 auto 150 -webkit-flex-order: 0151 150 -webkit-flex-pack: start 152 151 -webkit-flex-direction: row … … 193 192 -webkit-mask-size: auto 194 193 -webkit-nbsp-mode: normal 194 -webkit-order: 0 195 195 -webkit-perspective: none 196 196 -webkit-perspective-origin: 50% 50% -
trunk/LayoutTests/platform/mac/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 295 295 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 296 296 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 297 rect: style.getPropertyValue(-webkit-flex-order) : 0298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]299 297 rect: style.getPropertyValue(-webkit-flex-pack) : start 300 298 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 385 383 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 384 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 385 rect: style.getPropertyValue(-webkit-order) : 0 386 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 387 387 rect: style.getPropertyValue(-webkit-perspective) : none 388 388 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 829 829 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 830 830 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 831 g: style.getPropertyValue(-webkit-flex-order) : 0832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]833 831 g: style.getPropertyValue(-webkit-flex-pack) : start 834 832 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/qt/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r119191 r119255 148 148 -webkit-align-self: stretch 149 149 -webkit-flex: 1 1 auto 150 -webkit-flex-order: 0151 150 -webkit-flex-pack: start 152 151 -webkit-flex-direction: row … … 193 192 -webkit-mask-size: auto 194 193 -webkit-nbsp-mode: normal 194 -webkit-order: 0 195 195 -webkit-perspective: none 196 196 -webkit-perspective-origin: 50% 50% -
trunk/LayoutTests/platform/qt/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 295 295 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 296 296 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 297 rect: style.getPropertyValue(-webkit-flex-order) : 0298 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]299 297 rect: style.getPropertyValue(-webkit-flex-pack) : start 300 298 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 385 383 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 386 384 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 385 rect: style.getPropertyValue(-webkit-order) : 0 386 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 387 387 rect: style.getPropertyValue(-webkit-perspective) : none 388 388 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 829 829 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 830 830 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 831 g: style.getPropertyValue(-webkit-flex-order) : 0832 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]833 831 g: style.getPropertyValue(-webkit-flex-pack) : start 834 832 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] -
trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-expected.txt
r119191 r119255 149 149 -webkit-align-self: stretch; 150 150 -webkit-flex: 1 1 auto; 151 -webkit-flex-order: 0;152 151 -webkit-flex-pack: start; 153 152 -webkit-flex-direction: row; … … 194 193 -webkit-mask-size: auto; 195 194 -webkit-nbsp-mode: normal; 195 -webkit-order: 0; 196 196 -webkit-perspective: none; 197 197 -webkit-perspective-origin: 392px 288px; -
trunk/LayoutTests/platform/win/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt
r119191 r119255 148 148 -webkit-align-self: stretch 149 149 -webkit-flex: 1 1 auto 150 -webkit-flex-order: 0151 150 -webkit-flex-pack: start 152 151 -webkit-flex-direction: row … … 193 192 -webkit-mask-size: auto 194 193 -webkit-nbsp-mode: normal 194 -webkit-order: 0 195 195 -webkit-perspective: none 196 196 -webkit-perspective-origin: 50% 50% -
trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt
r119191 r119255 291 291 rect: style.getPropertyValue(-webkit-flex) : 1 1 auto 292 292 rect: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 293 rect: style.getPropertyValue(-webkit-flex-order) : 0294 rect: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]295 293 rect: style.getPropertyValue(-webkit-flex-pack) : start 296 294 rect: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] … … 381 379 rect: style.getPropertyValue(-webkit-nbsp-mode) : normal 382 380 rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue] 381 rect: style.getPropertyValue(-webkit-order) : 0 382 rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue] 383 383 rect: style.getPropertyValue(-webkit-perspective) : none 384 384 rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue] … … 821 821 g: style.getPropertyValue(-webkit-flex) : 1 1 auto 822 822 g: style.getPropertyCSSValue(-webkit-flex) : [object CSSValueList] 823 g: style.getPropertyValue(-webkit-flex-order) : 0824 g: style.getPropertyCSSValue(-webkit-flex-order) : [object CSSPrimitiveValue]825 823 g: style.getPropertyValue(-webkit-flex-pack) : start 826 824 g: style.getPropertyCSSValue(-webkit-flex-pack) : [object CSSPrimitiveValue] -
trunk/Source/WebCore/ChangeLog
r119252 r119255 1 2012-06-01 Tony Chang <tony@chromium.org> 2 3 rename -webkit-flex-order to -webkit-order 4 https://bugs.webkit.org/show_bug.cgi?id=88104 5 6 Reviewed by Ojan Vafai. 7 8 This recently changed in the spec: 9 http://dev.w3.org/csswg/css3-flexbox/#order-property 10 11 No new tests, just updated existing results. 12 13 * css/CSSComputedStyleDeclaration.cpp: 14 (WebCore): 15 (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): 16 * css/CSSParser.cpp: 17 (WebCore::CSSParser::parseValue): 18 * css/CSSProperty.cpp: 19 (WebCore::CSSProperty::isInheritedProperty): 20 * css/CSSPropertyNames.in: 21 * css/StyleBuilder.cpp: 22 (WebCore::StyleBuilder::StyleBuilder): 23 * css/StyleResolver.cpp: 24 (WebCore::StyleResolver::collectMatchingRulesForList): 25 * rendering/RenderFlexibleBox.cpp: 26 (WebCore::RenderFlexibleBox::OrderIterator::OrderIterator): 27 (WebCore::RenderFlexibleBox::OrderIterator::next): 28 (WebCore::RenderFlexibleBox::layoutBlock): 29 (WebCore::RenderFlexibleBox::repositionLogicalHeightDependentFlexItems): 30 (WebCore::RenderFlexibleBox::layoutFlexItems): 31 (WebCore::RenderFlexibleBox::computeMainAxisPreferredSizes): 32 (WebCore::RenderFlexibleBox::computeNextFlexLine): 33 (WebCore::RenderFlexibleBox::packFlexLines): 34 (WebCore::RenderFlexibleBox::alignChildren): 35 (WebCore::RenderFlexibleBox::flipForRightToLeftColumn): 36 (WebCore::RenderFlexibleBox::flipForWrapReverse): 37 * rendering/RenderFlexibleBox.h: 38 * rendering/style/RenderStyle.h: 39 * rendering/style/StyleFlexibleBoxData.cpp: 40 (WebCore::StyleFlexibleBoxData::StyleFlexibleBoxData): 41 (WebCore::StyleFlexibleBoxData::operator==): 42 * rendering/style/StyleFlexibleBoxData.h: 43 (StyleFlexibleBoxData): 44 * rendering/style/StyleRareNonInheritedData.cpp: 45 (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): 46 (WebCore::StyleRareNonInheritedData::operator==): 47 * rendering/style/StyleRareNonInheritedData.h: 48 (StyleRareNonInheritedData): 49 1 50 2012-06-01 Zeno Albisser <zeno@webkit.org> 2 51 -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r119131 r119255 232 232 CSSPropertyWebkitAlignSelf, 233 233 CSSPropertyWebkitFlex, 234 CSSPropertyWebkitFlexOrder,235 234 CSSPropertyWebkitFlexPack, 236 235 CSSPropertyWebkitFlexDirection, … … 280 279 CSSPropertyWebkitMaskSize, 281 280 CSSPropertyWebkitNbspMode, 281 CSSPropertyWebkitOrder, 282 282 #if ENABLE(OVERFLOW_SCROLLING) 283 283 CSSPropertyWebkitOverflowScrolling, … … 1651 1651 return list.release(); 1652 1652 } 1653 case CSSPropertyWebkit FlexOrder:1654 return cssValuePool().createValue(style-> flexOrder(), CSSPrimitiveValue::CSS_NUMBER);1653 case CSSPropertyWebkitOrder: 1654 return cssValuePool().createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER); 1655 1655 case CSSPropertyWebkitFlexPack: 1656 1656 return cssValuePool().createValue(style->flexPack()); -
trunk/Source/WebCore/css/CSSParser.cpp
r119191 r119255 2096 2096 parsedValue = parseFlex(m_valueList.get()); 2097 2097 break; 2098 case CSSPropertyWebkit FlexOrder:2098 case CSSPropertyWebkitOrder: 2099 2099 if (validUnit(value, FInteger, CSSStrictMode)) { 2100 2100 // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set. -
trunk/Source/WebCore/css/CSSProperty.cpp
r119131 r119255 543 543 case CSSPropertyWebkitAlignSelf: 544 544 case CSSPropertyWebkitFlex: 545 case CSSPropertyWebkitFlexOrder:546 545 case CSSPropertyWebkitFlexPack: 547 546 case CSSPropertyWebkitFlexDirection: … … 597 596 case CSSPropertyWebkitMinLogicalWidth: 598 597 case CSSPropertyWebkitMinLogicalHeight: 598 case CSSPropertyWebkitOrder: 599 599 case CSSPropertyWebkitPaddingAfter: 600 600 case CSSPropertyWebkitPaddingBefore: -
trunk/Source/WebCore/css/CSSPropertyNames.in
r119131 r119255 265 265 -webkit-flex-flow 266 266 -webkit-flex-line-pack 267 -webkit-flex-order268 267 -webkit-flex-pack 269 268 -webkit-flex-wrap … … 329 328 -webkit-min-logical-height 330 329 -webkit-nbsp-mode 330 -webkit-order 331 331 -webkit-padding-after 332 332 -webkit-padding-before -
trunk/Source/WebCore/css/StyleBuilder.cpp
r119191 r119255 1943 1943 setPropertyHandler(CSSPropertyWebkitFlexFlow, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitFlexDirection, CSSPropertyWebkitFlexWrap>::createHandler()); 1944 1944 setPropertyHandler(CSSPropertyWebkitFlexLinePack, ApplyPropertyDefault<EFlexLinePack, &RenderStyle::flexLinePack, EFlexLinePack, &RenderStyle::setFlexLinePack, EFlexLinePack, &RenderStyle::initialFlexLinePack>::createHandler()); 1945 setPropertyHandler(CSSPropertyWebkitFlexOrder, ApplyPropertyDefault<int, &RenderStyle::flexOrder, int, &RenderStyle::setFlexOrder, int, &RenderStyle::initialFlexOrder>::createHandler());1946 1945 setPropertyHandler(CSSPropertyWebkitFlexPack, ApplyPropertyDefault<EFlexPack, &RenderStyle::flexPack, EFlexPack, &RenderStyle::setFlexPack, EFlexPack, &RenderStyle::initialFlexPack>::createHandler()); 1947 1946 setPropertyHandler(CSSPropertyWebkitFlexWrap, ApplyPropertyDefault<EFlexWrap, &RenderStyle::flexWrap, EFlexWrap, &RenderStyle::setFlexWrap, EFlexWrap, &RenderStyle::initialFlexWrap>::createHandler()); … … 1991 1990 setPropertyHandler(CSSPropertyWebkitMatchNearestMailBlockquoteColor, ApplyPropertyDefault<EMatchNearestMailBlockquoteColor, &RenderStyle::matchNearestMailBlockquoteColor, EMatchNearestMailBlockquoteColor, &RenderStyle::setMatchNearestMailBlockquoteColor, EMatchNearestMailBlockquoteColor, &RenderStyle::initialMatchNearestMailBlockquoteColor>::createHandler()); 1992 1991 setPropertyHandler(CSSPropertyWebkitNbspMode, ApplyPropertyDefault<ENBSPMode, &RenderStyle::nbspMode, ENBSPMode, &RenderStyle::setNBSPMode, ENBSPMode, &RenderStyle::initialNBSPMode>::createHandler()); 1992 setPropertyHandler(CSSPropertyWebkitOrder, ApplyPropertyDefault<int, &RenderStyle::order, int, &RenderStyle::setOrder, int, &RenderStyle::initialOrder>::createHandler()); 1993 1993 setPropertyHandler(CSSPropertyWebkitPerspectiveOrigin, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitPerspectiveOriginX, CSSPropertyWebkitPerspectiveOriginY>::createHandler()); 1994 1994 setPropertyHandler(CSSPropertyWebkitPerspectiveOriginX, ApplyPropertyLength<&RenderStyle::perspectiveOriginX, &RenderStyle::setPerspectiveOriginX, &RenderStyle::initialPerspectiveOriginX>::createHandler()); -
trunk/Source/WebCore/css/StyleResolver.cpp
r119226 r119255 4128 4128 case CSSPropertyWebkitFlexFlow: 4129 4129 case CSSPropertyWebkitFlexLinePack: 4130 case CSSPropertyWebkitFlexOrder:4131 4130 case CSSPropertyWebkitFlexPack: 4132 4131 case CSSPropertyWebkitFlexWrap: … … 4171 4170 case CSSPropertyWebkitMatchNearestMailBlockquoteColor: 4172 4171 case CSSPropertyWebkitNbspMode: 4172 case CSSPropertyWebkitOrder: 4173 4173 case CSSPropertyWebkitPerspectiveOrigin: 4174 4174 case CSSPropertyWebkitPerspectiveOriginX: -
trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp
r119131 r119255 43 43 // we make the two smallest int values invalid flex-order values (in the css parser code we clamp them to 44 44 // int min + 2). 45 struct RenderFlexibleBox:: FlexOrderHashTraits : WTF::GenericHashTraits<int> {45 struct RenderFlexibleBox::OrderHashTraits : WTF::GenericHashTraits<int> { 46 46 static const bool emptyValueIsZero = false; 47 47 static int emptyValue() { return std::numeric_limits<int>::min(); } … … 50 50 }; 51 51 52 class RenderFlexibleBox:: FlexOrderIterator {52 class RenderFlexibleBox::OrderIterator { 53 53 public: 54 FlexOrderIterator(RenderFlexibleBox* flexibleBox, const FlexOrderHashSet& flexOrderValues)54 OrderIterator(RenderFlexibleBox* flexibleBox, const OrderHashSet& orderValues) 55 55 : m_flexibleBox(flexibleBox) 56 56 , m_currentChild(0) 57 57 , m_orderValuesIterator(0) 58 58 { 59 copyToVector( flexOrderValues, m_orderValues);59 copyToVector(orderValues, m_orderValues); 60 60 std::sort(m_orderValues.begin(), m_orderValues.end()); 61 61 first(); … … 86 86 } else 87 87 m_currentChild = m_currentChild->nextSiblingBox(); 88 } while (!m_currentChild || m_currentChild->style()-> flexOrder() != *m_orderValuesIterator);88 } while (!m_currentChild || m_currentChild->style()->order() != *m_orderValuesIterator); 89 89 90 90 return m_currentChild; … … 265 265 266 266 WTF::Vector<LineContext> lineContexts; 267 FlexOrderHashSet flexOrderValues;268 computeMainAxisPreferredSizes(relayoutChildren, flexOrderValues);269 FlexOrderIterator flexIterator(this, flexOrderValues);267 OrderHashSet orderValues; 268 computeMainAxisPreferredSizes(relayoutChildren, orderValues); 269 OrderIterator flexIterator(this, orderValues); 270 270 layoutFlexItems(flexIterator, lineContexts); 271 271 … … 297 297 } 298 298 299 void RenderFlexibleBox::repositionLogicalHeightDependentFlexItems( FlexOrderIterator& iterator, WTF::Vector<LineContext>& lineContexts, LayoutUnit& oldClientAfterEdge)299 void RenderFlexibleBox::repositionLogicalHeightDependentFlexItems(OrderIterator& iterator, WTF::Vector<LineContext>& lineContexts, LayoutUnit& oldClientAfterEdge) 300 300 { 301 301 LayoutUnit crossAxisStartEdge = lineContexts.isEmpty() ? ZERO_LAYOUT_UNIT : lineContexts[0].crossAxisOffset; … … 621 621 } 622 622 623 void RenderFlexibleBox::layoutFlexItems( FlexOrderIterator& iterator, WTF::Vector<LineContext>& lineContexts)623 void RenderFlexibleBox::layoutFlexItems(OrderIterator& iterator, WTF::Vector<LineContext>& lineContexts) 624 624 { 625 625 OrderedFlexItemList orderedChildren; … … 747 747 } 748 748 749 void RenderFlexibleBox::computeMainAxisPreferredSizes(bool relayoutChildren, FlexOrderHashSet& flexOrderValues)749 void RenderFlexibleBox::computeMainAxisPreferredSizes(bool relayoutChildren, OrderHashSet& orderValues) 750 750 { 751 751 LayoutUnit flexboxAvailableContentExtent = mainAxisContentExtent(); 752 752 RenderView* renderView = view(); 753 753 for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) { 754 flexOrderValues.add(child->style()->flexOrder());754 orderValues.add(child->style()->order()); 755 755 756 756 if (child->isPositioned()) … … 805 805 } 806 806 807 bool RenderFlexibleBox::computeNextFlexLine( FlexOrderIterator& iterator, OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, float& totalPositiveFlexibility, float& totalWeightedNegativeFlexibility, LayoutUnit& minMaxAppliedMainAxisExtent)807 bool RenderFlexibleBox::computeNextFlexLine(OrderIterator& iterator, OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, float& totalPositiveFlexibility, float& totalWeightedNegativeFlexibility, LayoutUnit& minMaxAppliedMainAxisExtent) 808 808 { 809 809 orderedChildren.clear(); … … 1095 1095 } 1096 1096 1097 void RenderFlexibleBox::packFlexLines( FlexOrderIterator& iterator, WTF::Vector<LineContext>& lineContexts)1097 void RenderFlexibleBox::packFlexLines(OrderIterator& iterator, WTF::Vector<LineContext>& lineContexts) 1098 1098 { 1099 1099 if (!isMultiline() || style()->flexLinePack() == LinePackStart) … … 1140 1140 } 1141 1141 1142 void RenderFlexibleBox::alignChildren( FlexOrderIterator& iterator, const WTF::Vector<LineContext>& lineContexts)1142 void RenderFlexibleBox::alignChildren(OrderIterator& iterator, const WTF::Vector<LineContext>& lineContexts) 1143 1143 { 1144 1144 // Keep track of the space between the baseline edge and the after edge of the box for each line. … … 1232 1232 } 1233 1233 1234 void RenderFlexibleBox::flipForRightToLeftColumn( FlexOrderIterator& iterator)1234 void RenderFlexibleBox::flipForRightToLeftColumn(OrderIterator& iterator) 1235 1235 { 1236 1236 if (style()->isLeftToRightDirection() || !isColumnFlow()) … … 1247 1247 } 1248 1248 1249 void RenderFlexibleBox::flipForWrapReverse( FlexOrderIterator& iterator, const WTF::Vector<LineContext>& lineContexts, LayoutUnit crossAxisStartEdge)1249 void RenderFlexibleBox::flipForWrapReverse(OrderIterator& iterator, const WTF::Vector<LineContext>& lineContexts, LayoutUnit crossAxisStartEdge) 1250 1250 { 1251 1251 LayoutUnit contentExtent = crossAxisContentExtent(); -
trunk/Source/WebCore/rendering/RenderFlexibleBox.h
r118818 r119255 60 60 }; 61 61 62 struct FlexOrderHashTraits;63 typedef HashSet<int, DefaultHash<int>::Hash, FlexOrderHashTraits> FlexOrderHashSet;62 struct OrderHashTraits; 63 typedef HashSet<int, DefaultHash<int>::Hash, OrderHashTraits> OrderHashSet; 64 64 65 class FlexOrderIterator;65 class OrderIterator; 66 66 typedef WTF::HashMap<const RenderBox*, LayoutUnit> InflexibleFlexItemSize; 67 67 typedef WTF::Vector<RenderBox*> OrderedFlexItemList; … … 106 106 LayoutUnit preferredMainAxisContentExtentForChild(RenderBox* child) const; 107 107 108 void layoutFlexItems( FlexOrderIterator&, WTF::Vector<LineContext>&);108 void layoutFlexItems(OrderIterator&, WTF::Vector<LineContext>&); 109 109 LayoutUnit autoMarginOffsetInMainAxis(const OrderedFlexItemList&, LayoutUnit& availableFreeSpace); 110 110 void updateAutoMarginsInMainAxis(RenderBox* child, LayoutUnit autoMarginOffset); 111 111 bool hasAutoMarginsInCrossAxis(RenderBox* child); 112 112 bool updateAutoMarginsInCrossAxis(RenderBox* child, LayoutUnit availableAlignmentSpace); 113 void repositionLogicalHeightDependentFlexItems( FlexOrderIterator&, WTF::Vector<LineContext>&, LayoutUnit& oldClientAfterEdge);113 void repositionLogicalHeightDependentFlexItems(OrderIterator&, WTF::Vector<LineContext>&, LayoutUnit& oldClientAfterEdge); 114 114 115 115 LayoutUnit availableAlignmentSpaceForChild(LayoutUnit lineCrossAxisExtent, RenderBox*); 116 116 LayoutUnit marginBoxAscentForChild(RenderBox*); 117 117 118 void computeMainAxisPreferredSizes(bool relayoutChildren, FlexOrderHashSet&);118 void computeMainAxisPreferredSizes(bool relayoutChildren, OrderHashSet&); 119 119 LayoutUnit lineBreakLength(); 120 120 LayoutUnit adjustChildSizeForMinAndMax(RenderBox*, LayoutUnit childSize, LayoutUnit flexboxAvailableContentExtent); 121 bool computeNextFlexLine( FlexOrderIterator&, OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, float& totalPositiveFlexibility, float& totalWeightedNegativeFlexibility, LayoutUnit& minMaxAppliedMainAxisExtent);121 bool computeNextFlexLine(OrderIterator&, OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, float& totalPositiveFlexibility, float& totalWeightedNegativeFlexibility, LayoutUnit& minMaxAppliedMainAxisExtent); 122 122 LayoutUnit computeAvailableFreeSpace(LayoutUnit preferredMainAxisExtent); 123 123 … … 129 129 void layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, const OrderedFlexItemList&, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, WTF::Vector<LineContext>&); 130 130 void layoutColumnReverse(const OrderedFlexItemList&, const WTF::Vector<LayoutUnit>& childSizes, LayoutUnit crossAxisOffset, LayoutUnit availableFreeSpace); 131 void packFlexLines( FlexOrderIterator&, WTF::Vector<LineContext>&);132 void alignChildren( FlexOrderIterator&, const WTF::Vector<LineContext>&);131 void packFlexLines(OrderIterator&, WTF::Vector<LineContext>&); 132 void alignChildren(OrderIterator&, const WTF::Vector<LineContext>&); 133 133 void applyStretchAlignmentToChild(RenderBox*, LayoutUnit lineCrossAxisExtent); 134 void flipForRightToLeftColumn( FlexOrderIterator&);135 void flipForWrapReverse( FlexOrderIterator&, const WTF::Vector<LineContext>&, LayoutUnit crossAxisStartEdge);134 void flipForRightToLeftColumn(OrderIterator&); 135 void flipForWrapReverse(OrderIterator&, const WTF::Vector<LineContext>&, LayoutUnit crossAxisStartEdge); 136 136 }; 137 137 -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r119191 r119255 805 805 EBoxPack boxPack() const { return static_cast<EBoxPack>(rareNonInheritedData->m_deprecatedFlexibleBox->pack); } 806 806 807 int order() const { return rareNonInheritedData->m_order; } 807 808 float positiveFlex() const { return rareNonInheritedData->m_flexibleBox->m_positiveFlex; } 808 809 float negativeFlex() const { return rareNonInheritedData->m_flexibleBox->m_negativeFlex; } 809 810 Length flexPreferredSize() const { return rareNonInheritedData->m_flexibleBox->m_preferredSize; } 810 int flexOrder() const { return rareNonInheritedData->m_flexibleBox->m_flexOrder; }811 811 EFlexPack flexPack() const { return static_cast<EFlexPack>(rareNonInheritedData->m_flexibleBox->m_flexPack); } 812 812 EAlignItems alignItems() const { return static_cast<EAlignItems>(rareNonInheritedData->m_alignItems); } … … 1250 1250 void setNegativeFlex(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_negativeFlex, f); } 1251 1251 void setFlexPreferredSize(Length l) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_preferredSize, l); } 1252 void set FlexOrder(int o) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexOrder, o); }1252 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, o); } 1253 1253 void setFlexPack(EFlexPack p) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexPack, p); } 1254 1254 void setAlignItems(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignItems, a); } … … 1584 1584 static float initialNegativeFlex() { return 1; } 1585 1585 static Length initialFlexPreferredSize() { return Length(Auto); } 1586 static int initial FlexOrder() { return 0; }1586 static int initialOrder() { return 0; } 1587 1587 static EFlexPack initialFlexPack() { return PackStart; } 1588 1588 static EAlignItems initialAlignItems() { return AlignStretch; } -
trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.cpp
r119131 r119255 35 35 , m_negativeFlex(RenderStyle::initialNegativeFlex()) 36 36 , m_preferredSize(RenderStyle::initialFlexPreferredSize()) 37 , m_flexOrder(RenderStyle::initialFlexOrder())38 37 , m_flexPack(RenderStyle::initialFlexPack()) 39 38 , m_flexDirection(RenderStyle::initialFlexDirection()) … … 48 47 , m_negativeFlex(o.m_negativeFlex) 49 48 , m_preferredSize(o.m_preferredSize) 50 , m_flexOrder(o.m_flexOrder)51 49 , m_flexPack(o.m_flexPack) 52 50 , m_flexDirection(o.m_flexDirection) … … 59 57 { 60 58 return m_positiveFlex == o.m_positiveFlex && m_negativeFlex == o.m_negativeFlex && m_preferredSize == o.m_preferredSize 61 && m_flex Order == o.m_flexOrder && m_flexPack == o.m_flexPack&& m_flexDirection == o.m_flexDirection59 && m_flexPack == o.m_flexPack && m_flexDirection == o.m_flexDirection 62 60 && m_flexWrap == o.m_flexWrap && m_flexLinePack == o.m_flexLinePack; 63 61 } -
trunk/Source/WebCore/rendering/style/StyleFlexibleBoxData.h
r119131 r119255 49 49 Length m_preferredSize; 50 50 51 int m_flexOrder;52 53 51 unsigned m_flexPack : 3; // EFlexPack 54 52 unsigned m_flexDirection : 2; // EFlexDirection -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
r119131 r119255 51 51 , m_wrapPadding(RenderStyle::initialWrapPadding()) 52 52 , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor()) 53 , m_order(RenderStyle::initialOrder()) 53 54 , m_flowThread(RenderStyle::initialFlowThread()) 54 55 , m_regionThread(RenderStyle::initialRegionThread()) … … 120 121 , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor) 121 122 , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor) 123 , m_order(o.m_order) 122 124 , m_flowThread(o.m_flowThread) 123 125 , m_regionThread(o.m_regionThread) … … 195 197 && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor 196 198 && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor 199 && m_order == o.m_order 197 200 && m_flowThread == o.m_flowThread 198 201 && m_regionThread == o.m_regionThread -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
r119131 r119255 147 147 Color m_visitedLinkBorderBottomColor; 148 148 149 int m_order; 150 149 151 AtomicString m_flowThread; 150 152 AtomicString m_regionThread;
Note: See TracChangeset
for help on using the changeset viewer.