Changeset 253917 in webkit


Ignore:
Timestamp:
Dec 26, 2019 12:38:55 PM (4 years ago)
Author:
Antti Koivisto
Message:

Remove display:compact
​https://bugs.webkit.org/show_bug.cgi?id=205597

Reviewed by Anders Carlsson.

Source/WebCore:

It is rendered as 'block' but the value is still parsed. Remove it completely, matching other engines.

Test: fast/css/display-compact-ignored.html

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):

  • css/CSSValueKeywords.in:
  • rendering/RenderElement.cpp:

(WebCore::RenderElement::createFor):

  • rendering/RenderTheme.cpp:

(WebCore::RenderTheme::adjustStyle):

  • rendering/style/RenderStyleConstants.cpp:

(WebCore::operator<<):

  • rendering/style/RenderStyleConstants.h:
  • style/StyleAdjuster.cpp:

(WebCore::Style::equivalentBlockDisplay):

LayoutTests:

  • fast/css/display-compact-ignored-expected.txt: Added.
  • fast/css/display-compact-ignored.html: Added.
Location:
trunk
Files:
2 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r253913 r253917  
     12019-12-26  Antti Koivisto  <antti@apple.com>
     2
     3        Remove display:compact
     4        https://bugs.webkit.org/show_bug.cgi?id=205597
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * fast/css/display-compact-ignored-expected.txt: Added.
     9        * fast/css/display-compact-ignored.html: Added.
     10
    1112019-12-26  youenn fablet  <youenn@apple.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r253916 r253917  
     12019-12-26  Antti Koivisto  <antti@apple.com>
     2
     3        Remove display:compact
     4        https://bugs.webkit.org/show_bug.cgi?id=205597
     5
     6        Reviewed by Anders Carlsson.
     7
     8        It is rendered as 'block' but the value is still parsed. Remove it completely, matching other engines.
     9
     10        Test: fast/css/display-compact-ignored.html
     11
     12        * css/CSSPrimitiveValueMappings.h:
     13        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
     14        * css/CSSValueKeywords.in:
     15        * rendering/RenderElement.cpp:
     16        (WebCore::RenderElement::createFor):
     17        * rendering/RenderTheme.cpp:
     18        (WebCore::RenderTheme::adjustStyle):
     19        * rendering/style/RenderStyleConstants.cpp:
     20        (WebCore::operator<<):
     21        * rendering/style/RenderStyleConstants.h:
     22        * style/StyleAdjuster.cpp:
     23        (WebCore::Style::equivalentBlockDisplay):
     24
    1252019-12-26  Wenson Hsieh  <wenson_hsieh@apple.com>
    226

  • trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

    r252965 r253917  
    13461346    case DisplayType::ListItem:
    13471347        m_value.valueID = CSSValueListItem;
    1348         break;
    1349     case DisplayType::Compact:
    1350         m_value.valueID = CSSValueCompact;
    13511348        break;
    13521349    case DisplayType::InlineBlock:

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

    r253105 r253917  
    434434block
    435435list-item
    436 compact
    437436inline-block
    438437table

  • trunk/Source/WebCore/rendering/RenderElement.cpp

    r252935 r253917  
    165165    case DisplayType::FlowRoot:
    166166    case DisplayType::InlineBlock:
    167     case DisplayType::Compact:
    168167        return createRenderer<RenderBlockFlow>(element, WTFMove(style));
    169168    case DisplayType::ListItem:

  • trunk/Source/WebCore/rendering/RenderTheme.cpp

    r252308 r253917  
    8888        || style.display() == DisplayType::TableCell || style.display() == DisplayType::TableCaption)
    8989        style.setDisplay(DisplayType::InlineBlock);
    90     else if (style.display() == DisplayType::Compact || style.display() == DisplayType::ListItem || style.display() == DisplayType::Table)
     90    else if (style.display() == DisplayType::ListItem || style.display() == DisplayType::Table)
    9191        style.setDisplay(DisplayType::Block);
    9292

  • trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp

    r252336 r253917  
    417417    case DisplayType::Block: ts << "block"; break;
    418418    case DisplayType::ListItem: ts << "list-item"; break;
    419     case DisplayType::Compact: ts << "compact"; break;
    420419    case DisplayType::InlineBlock: ts << "inline-block"; break;
    421420    case DisplayType::Table: ts << "table"; break;

  • trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

    r253158 r253917  
    873873    Block,
    874874    ListItem,
    875     Compact,
    876875    InlineBlock,
    877876    Table,

  • trunk/Source/WebCore/style/StyleAdjuster.cpp

    r253571 r253917  
    116116
    117117    case DisplayType::Inline:
    118     case DisplayType::Compact:
    119118    case DisplayType::InlineBlock:
    120119    case DisplayType::TableRowGroup:
Note: See TracChangeset for help on using the changeset viewer.