Changeset 119618 in webkit


Ignore:
Timestamp:
Jun 6, 2012 2:16:14 PM (12 years ago)
Author:
ojan@chromium.org
Message:

Remove some magic from the -webkit-flex shorthand parsing to match the changes in the spec
https://bugs.webkit.org/show_bug.cgi?id=88444

Reviewed by Tony Chang.

Source/WebCore:

-Unset positive flex defaults to 0.
-Unset negative flex defaults to 1. No magic of doing something different if positive flex was set.

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseFlex):

LayoutTests:

  • css3/flexbox/flex-property-parsing-expected.txt:
  • css3/flexbox/flex-property-parsing.html:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r119615 r119618  
     12012-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
    1112012-06-06  Joshua Bell  <jsbell@chromium.org>
    212
  • trunk/LayoutTests/css3/flexbox/flex-property-parsing-expected.txt

    r119191 r119618  
    1212PASS flexitem.style.webkitFlex is "2 1 0px"
    1313PASS getComputedStyle(flexitem).webkitFlex is "2 1 0px"
    14 PASS flexitem.style.webkitFlex is "0 0 0px"
    15 PASS getComputedStyle(flexitem).webkitFlex is "0 0 0px"
     14PASS flexitem.style.webkitFlex is "0 1 0px"
     15PASS getComputedStyle(flexitem).webkitFlex is "0 1 0px"
    1616PASS flexitem.style.webkitFlex is "1.5 1 0px"
    1717PASS getComputedStyle(flexitem).webkitFlex is "1.5 1 0px"
    18 PASS flexitem.style.webkitFlex is "1 1 auto"
    19 PASS getComputedStyle(flexitem).webkitFlex is "1 1 auto"
    20 PASS flexitem.style.webkitFlex is "1 1 1px"
    21 PASS getComputedStyle(flexitem).webkitFlex is "1 1 1px"
    22 PASS flexitem.style.webkitFlex is "1 1 2em"
    23 PASS getComputedStyle(flexitem).webkitFlex is "1 1 32px"
    24 PASS flexitem.style.webkitFlex is "1 1 0px"
    25 PASS getComputedStyle(flexitem).webkitFlex is "1 1 0px"
     18PASS flexitem.style.webkitFlex is "0 1 auto"
     19PASS getComputedStyle(flexitem).webkitFlex is "0 1 auto"
     20PASS flexitem.style.webkitFlex is "0 1 1px"
     21PASS getComputedStyle(flexitem).webkitFlex is "0 1 1px"
     22PASS flexitem.style.webkitFlex is "0 1 2em"
     23PASS getComputedStyle(flexitem).webkitFlex is "0 1 32px"
     24PASS flexitem.style.webkitFlex is "0 1 0px"
     25PASS getComputedStyle(flexitem).webkitFlex is "0 1 0px"
    2626PASS flexitem.style.webkitFlex is "none"
    2727PASS getComputedStyle(flexitem).webkitFlex is "0 0 auto"
     
    4242PASS flexitem.style.webkitFlex is "4 1 0px"
    4343PASS getComputedStyle(flexitem).webkitFlex is "4 1 0px"
    44 PASS flexitem.style.webkitFlex is "0 0 0px"
    45 PASS getComputedStyle(flexitem).webkitFlex is "0 0 0px"
     44PASS flexitem.style.webkitFlex is "0 1 0px"
     45PASS getComputedStyle(flexitem).webkitFlex is "0 1 0px"
    4646PASS flexitem.style.webkitFlex is "none"
    4747PASS getComputedStyle(flexitem).webkitFlex is "0 0 auto"
     
    7070PASS flexitem.style.webkitFlex is "0 0 auto"
    7171PASS getComputedStyle(flexitem).webkitFlex is "0 0 auto"
    72 PASS flexitem.style.webkitFlex is "0 0 auto"
    73 PASS getComputedStyle(flexitem).webkitFlex is "0 0 auto"
     72PASS flexitem.style.webkitFlex is "0 1 auto"
     73PASS getComputedStyle(flexitem).webkitFlex is "0 1 auto"
    7474PASS flexitem.style.webkitFlex is "3 1 auto"
    7575PASS getComputedStyle(flexitem).webkitFlex is "3 1 auto"
    76 PASS flexitem.style.webkitFlex is "0 0 0px"
    77 PASS getComputedStyle(flexitem).webkitFlex is "0 0 0px"
     76PASS flexitem.style.webkitFlex is "0 1 0px"
     77PASS getComputedStyle(flexitem).webkitFlex is "0 1 0px"
    7878PASS flexitem.style.webkitFlex is "0 0 0px"
    7979PASS getComputedStyle(flexitem).webkitFlex is "0 0 0px"
  • trunk/LayoutTests/css3/flexbox/flex-property-parsing.html

    r119191 r119618  
    3333
    3434flexitem.style.webkitFlex = '0';
    35 shouldBeEqualToString('flexitem.style.webkitFlex', '0 0 0px');
    36 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 0 0px');
     35shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 0px');
     36shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 0px');
    3737
    3838flexitem.style.webkitFlex = '1.5';
     
    4141
    4242flexitem.style.webkitFlex = 'auto';
    43 shouldBeEqualToString('flexitem.style.webkitFlex', '1 1 auto');
    44 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '1 1 auto');
     43shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 auto');
     44shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 auto');
    4545
    4646flexitem.style.webkitFlex = '1px';
    47 shouldBeEqualToString('flexitem.style.webkitFlex', '1 1 1px');
    48 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '1 1 1px');
     47shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 1px');
     48shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 1px');
    4949
    5050flexitem.style.webkitFlex = '2em';
    51 shouldBeEqualToString('flexitem.style.webkitFlex', '1 1 2em');
    52 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '1 1 32px');
     51shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 2em');
     52shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 32px');
    5353
    5454flexitem.style.webkitFlex = '0px';
    55 shouldBeEqualToString('flexitem.style.webkitFlex', '1 1 0px');
    56 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '1 1 0px');
     55shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 0px');
     56shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 0px');
    5757
    5858flexitem.style.webkitFlex = 'none';
     
    9494
    9595flexitem.style.webkitFlex = '0 0px';
    96 shouldBeEqualToString('flexitem.style.webkitFlex', '0 0 0px');
    97 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 0 0px');
     96shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 0px');
     97shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 0px');
    9898
    9999flexitem.style.webkitFlex = 'none';
     
    151151
    152152flexitem.style.webkitFlex = 'auto 0';
    153 shouldBeEqualToString('flexitem.style.webkitFlex', '0 0 auto');
    154 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 0 auto');
     153shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 auto');
     154shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 auto');
    155155
    156156flexitem.style.webkitFlex = 'auto 3';
     
    159159
    160160flexitem.style.webkitFlex = '0px 0';
    161 shouldBeEqualToString('flexitem.style.webkitFlex', '0 0 0px');
    162 shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 0 0px');
     161shouldBeEqualToString('flexitem.style.webkitFlex', '0 1 0px');
     162shouldBeEqualToString('getComputedStyle(flexitem).webkitFlex', '0 1 0px');
    163163
    164164flexitem.style.webkitFlex = '0 0px 0';
  • trunk/Source/WebCore/ChangeLog

    r119617 r119618  
     12012-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
    1142012-06-06  Ryosuke Niwa  <rniwa@webkit.org>
    215
  • trunk/Source/WebCore/css/CSSParser.cpp

    r119455 r119618  
    55915591
    55925592    if (positiveFlex == unsetValue)
    5593         positiveFlex = 1;
     5593        positiveFlex = 0;
    55945594    if (negativeFlex == unsetValue)
    5595         negativeFlex = positiveFlex ? 1 : 0;
     5595        negativeFlex = 1;
    55965596    if (!preferredSize)
    55975597        preferredSize = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX);
Note: See TracChangeset for help on using the changeset viewer.