Changeset 89712 in webkit


Ignore:
Timestamp:
Jun 24, 2011 4:39:35 PM (13 years ago)
Author:
tony@chromium.org
Message:

2011-06-24 Tony Chang <​tony@chromium.org>

Reviewed by Ojan Vafai.

add flexbox and inline-flexbox as possible CSS display values
​https://bugs.webkit.org/show_bug.cgi?id=63361

  • css3/flexbox/display-property-expected.txt: Added.
  • css3/flexbox/display-property.html: Added.
  • css3/flexbox/script-tests/display-property.js: Added. (testFlex):

2011-06-24 Tony Chang <​tony@chromium.org>

Reviewed by Ojan Vafai.

add flexbox and inline-flexbox as possible CSS display values
​https://bugs.webkit.org/show_bug.cgi?id=63361

Test: css3/flexbox/display-property.html

  • css/CSSParser.cpp: (WebCore::CSSParser::parseValue):
  • css/CSSValueKeywords.in:
Location:
trunk
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r89709 r89712  
     12011-06-24  Tony Chang  <tony@chromium.org>
     2
     3        Reviewed by Ojan Vafai.
     4
     5        add flexbox and inline-flexbox as possible CSS display values
     6        https://bugs.webkit.org/show_bug.cgi?id=63361
     7
     8        * css3/flexbox/display-property-expected.txt: Added.
     9        * css3/flexbox/display-property.html: Added.
     10        * css3/flexbox/script-tests/display-property.js: Added.
     11        (testFlex):
     12
    1132011-06-24  Adrienne Walker  <enne@google.com>
    214

  • trunk/Source/WebCore/ChangeLog

    r89711 r89712  
     12011-06-24  Tony Chang  <tony@chromium.org>
     2
     3        Reviewed by Ojan Vafai.
     4
     5        add flexbox and inline-flexbox as possible CSS display values
     6        https://bugs.webkit.org/show_bug.cgi?id=63361
     7
     8        Test: css3/flexbox/display-property.html
     9
     10        * css/CSSParser.cpp:
     11        (WebCore::CSSParser::parseValue):
     12        * css/CSSValueKeywords.in:
     13
    1142011-06-24  Anna Cavender  <annacc@chromium.org>
    215

  • trunk/Source/WebCore/css/CSSParser.cpp

    r89680 r89712  
    970970        // inline | block | list-item | run-in | inline-block | table |
    971971        // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
    972         // table-column-group | table-column | table-cell | table-caption | box | inline-box | none | inherit
     972        // table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none | inherit
    973973#if ENABLE(WCSS)
    974974        if ((id >= CSSValueInline && id <= CSSValueWapMarquee) || id == CSSValueNone)
    … …  
    977977#endif
    978978            validPrimitive = true;
     979#if ENABLE(CSS3_FLEXBOX)
     980        if (id == CSSValueWebkitFlexbox || id == CSSValueWebkitInlineFlexbox)
     981            validPrimitive = true;
     982#endif
    979983        break;
    980984

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r89362 r89712  
    325325-webkit-inline-box
    326326-wap-marquee
     327-webkit-flexbox
     328-webkit-inline-flexbox
    327329//none
    328330//
Note: See TracChangeset for help on using the changeset viewer.