Changeset 119618 in webkit
- Timestamp:
- Jun 6, 2012 2:16:14 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r119615 r119618 1 2012-06-06 Ojan Vafai <ojan@chromium.org> 2 3 Remove some magic from the -webkit-flex shorthand parsing to match the changes in the spec 4 https://bugs.webkit.org/show_bug.cgi?id=88444 5 6 Reviewed by Tony Chang. 7 8 * css3/flexbox/flex-property-parsing-expected.txt: 9 * css3/flexbox/flex-property-parsing.html: 10 1 11 2012-06-06 Joshua Bell <jsbell@chromium.org> 2 12 -
trunk/LayoutTests/css3/flexbox/flex-property-parsing-expected.txt
r119191 r119618 12 12 PASS flexitem.style.webkitFlex is "2 1 0px" 13 13 PASS getComputedStyle(flexitem).webkitFlex is "2 1 0px" 14 PASS flexitem.style.webkitFlex is "0 00px"15 PASS getComputedStyle(flexitem).webkitFlex is "0 00px"14 PASS flexitem.style.webkitFlex is "0 1 0px" 15 PASS getComputedStyle(flexitem).webkitFlex is "0 1 0px" 16 16 PASS flexitem.style.webkitFlex is "1.5 1 0px" 17 17 PASS getComputedStyle(flexitem).webkitFlex is "1.5 1 0px" 18 PASS flexitem.style.webkitFlex is " 11 auto"19 PASS getComputedStyle(flexitem).webkitFlex is " 11 auto"20 PASS flexitem.style.webkitFlex is " 11 1px"21 PASS getComputedStyle(flexitem).webkitFlex is " 11 1px"22 PASS flexitem.style.webkitFlex is " 11 2em"23 PASS getComputedStyle(flexitem).webkitFlex is " 11 32px"24 PASS flexitem.style.webkitFlex is " 11 0px"25 PASS getComputedStyle(flexitem).webkitFlex is " 11 0px"18 PASS flexitem.style.webkitFlex is "0 1 auto" 19 PASS getComputedStyle(flexitem).webkitFlex is "0 1 auto" 20 PASS flexitem.style.webkitFlex is "0 1 1px" 21 PASS getComputedStyle(flexitem).webkitFlex is "0 1 1px" 22 PASS flexitem.style.webkitFlex is "0 1 2em" 23 PASS getComputedStyle(flexitem).webkitFlex is "0 1 32px" 24 PASS flexitem.style.webkitFlex is "0 1 0px" 25 PASS getComputedStyle(flexitem).webkitFlex is "0 1 0px" 26 26 PASS flexitem.style.webkitFlex is "none" 27 27 PASS getComputedStyle(flexitem).webkitFlex is "0 0 auto" … … 42 42 PASS flexitem.style.webkitFlex is "4 1 0px" 43 43 PASS getComputedStyle(flexitem).webkitFlex is "4 1 0px" 44 PASS flexitem.style.webkitFlex is "0 00px"45 PASS getComputedStyle(flexitem).webkitFlex is "0 00px"44 PASS flexitem.style.webkitFlex is "0 1 0px" 45 PASS getComputedStyle(flexitem).webkitFlex is "0 1 0px" 46 46 PASS flexitem.style.webkitFlex is "none" 47 47 PASS getComputedStyle(flexitem).webkitFlex is "0 0 auto" … … 70 70 PASS flexitem.style.webkitFlex is "0 0 auto" 71 71 PASS getComputedStyle(flexitem).webkitFlex is "0 0 auto" 72 PASS flexitem.style.webkitFlex is "0 0auto"73 PASS getComputedStyle(flexitem).webkitFlex is "0 0auto"72 PASS flexitem.style.webkitFlex is "0 1 auto" 73 PASS getComputedStyle(flexitem).webkitFlex is "0 1 auto" 74 74 PASS flexitem.style.webkitFlex is "3 1 auto" 75 75 PASS getComputedStyle(flexitem).webkitFlex is "3 1 auto" 76 PASS flexitem.style.webkitFlex is "0 00px"77 PASS getComputedStyle(flexitem).webkitFlex is "0 00px"76 PASS flexitem.style.webkitFlex is "0 1 0px" 77 PASS getComputedStyle(flexitem).webkitFlex is "0 1 0px" 78 78 PASS flexitem.style.webkitFlex is "0 0 0px" 79 79 PASS getComputedStyle(flexitem).webkitFlex is "0 0 0px" -
trunk/LayoutTests/css3/flexbox/flex-property-parsing.html
r119191 r119618 33 33 34 34 flexitem.style.webkitFlex = '0'; 35 shouldBeEqualToString('flexitem.style.webkitFlex', '0 00px');36 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 00px');35 shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 0px'); 36 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 0px'); 37 37 38 38 flexitem.style.webkitFlex = '1.5'; … … 41 41 42 42 flexitem.style.webkitFlex = 'auto'; 43 shouldBeEqualToString('flexitem.style.webkitFlex', ' 11 auto');44 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', ' 11 auto');43 shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 auto'); 44 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 auto'); 45 45 46 46 flexitem.style.webkitFlex = '1px'; 47 shouldBeEqualToString('flexitem.style.webkitFlex', ' 11 1px');48 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', ' 11 1px');47 shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 1px'); 48 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 1px'); 49 49 50 50 flexitem.style.webkitFlex = '2em'; 51 shouldBeEqualToString('flexitem.style.webkitFlex', ' 11 2em');52 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', ' 11 32px');51 shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 2em'); 52 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 32px'); 53 53 54 54 flexitem.style.webkitFlex = '0px'; 55 shouldBeEqualToString('flexitem.style.webkitFlex', ' 11 0px');56 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', ' 11 0px');55 shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 0px'); 56 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 0px'); 57 57 58 58 flexitem.style.webkitFlex = 'none'; … … 94 94 95 95 flexitem.style.webkitFlex = '0 0px'; 96 shouldBeEqualToString('flexitem.style.webkitFlex', '0 00px');97 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 00px');96 shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 0px'); 97 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 0px'); 98 98 99 99 flexitem.style.webkitFlex = 'none'; … … 151 151 152 152 flexitem.style.webkitFlex = 'auto 0'; 153 shouldBeEqualToString('flexitem.style.webkitFlex', '0 0auto');154 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 0auto');153 shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 auto'); 154 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 auto'); 155 155 156 156 flexitem.style.webkitFlex = 'auto 3'; … … 159 159 160 160 flexitem.style.webkitFlex = '0px 0'; 161 shouldBeEqualToString('flexitem.style.webkitFlex', '0 00px');162 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 00px');161 shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 0px'); 162 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 0px'); 163 163 164 164 flexitem.style.webkitFlex = '0 0px 0'; -
trunk/Source/WebCore/ChangeLog
r119617 r119618 1 2012-06-06 Ojan Vafai <ojan@chromium.org> 2 3 Remove some magic from the -webkit-flex shorthand parsing to match the changes in the spec 4 https://bugs.webkit.org/show_bug.cgi?id=88444 5 6 Reviewed by Tony Chang. 7 8 -Unset positive flex defaults to 0. 9 -Unset negative flex defaults to 1. No magic of doing something different if positive flex was set. 10 11 * css/CSSParser.cpp: 12 (WebCore::CSSParser::parseFlex): 13 1 14 2012-06-06 Ryosuke Niwa <rniwa@webkit.org> 2 15 -
trunk/Source/WebCore/css/CSSParser.cpp
r119455 r119618 5591 5591 5592 5592 if (positiveFlex == unsetValue) 5593 positiveFlex = 1;5593 positiveFlex = 0; 5594 5594 if (negativeFlex == unsetValue) 5595 negativeFlex = positiveFlex ? 1 : 0;5595 negativeFlex = 1; 5596 5596 if (!preferredSize) 5597 5597 preferredSize = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX);
Note: See TracChangeset
for help on using the changeset viewer.