Diff
Modified: trunk/LayoutTests/ChangeLog (253916 => 253917)
--- trunk/LayoutTests/ChangeLog 2019-12-26 19:01:03 UTC (rev 253916)
+++ trunk/LayoutTests/ChangeLog 2019-12-26 20:38:55 UTC (rev 253917)
@@ -1,3 +1,13 @@
+2019-12-26 Antti Koivisto <[email protected]>
+
+ Remove display:compact
+ https://bugs.webkit.org/show_bug.cgi?id=205597
+
+ Reviewed by Anders Carlsson.
+
+ * fast/css/display-compact-ignored-expected.txt: Added.
+ * fast/css/display-compact-ignored.html: Added.
+
2019-12-26 youenn fablet <[email protected]>
REGRESSION: [ Mojave+ Debug ] fast/mediastream/captureStream/canvas2d-heavy-drawing.html is a flakey failure
Added: trunk/LayoutTests/fast/css/display-compact-ignored-expected.txt (0 => 253917)
--- trunk/LayoutTests/fast/css/display-compact-ignored-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/display-compact-ignored-expected.txt 2019-12-26 20:38:55 UTC (rev 253917)
@@ -0,0 +1,5 @@
+PASS getComputedStyle(test).display is "inline"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/css/display-compact-ignored.html (0 => 253917)
--- trunk/LayoutTests/fast/css/display-compact-ignored.html (rev 0)
+++ trunk/LayoutTests/fast/css/display-compact-ignored.html 2019-12-26 20:38:55 UTC (rev 253917)
@@ -0,0 +1,6 @@
+<script src=""
+<span id=test style="display:compact"></span>
+<script>
+shouldBeEqualToString("getComputedStyle(test).display", "inline");
+</script>
+<script src=""
Modified: trunk/Source/WebCore/ChangeLog (253916 => 253917)
--- trunk/Source/WebCore/ChangeLog 2019-12-26 19:01:03 UTC (rev 253916)
+++ trunk/Source/WebCore/ChangeLog 2019-12-26 20:38:55 UTC (rev 253917)
@@ -1,3 +1,27 @@
+2019-12-26 Antti Koivisto <[email protected]>
+
+ Remove display:compact
+ https://bugs.webkit.org/show_bug.cgi?id=205597
+
+ Reviewed by Anders Carlsson.
+
+ 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):
+
2019-12-26 Wenson Hsieh <[email protected]>
Minor code cleanup around WebCore::Path
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (253916 => 253917)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2019-12-26 19:01:03 UTC (rev 253916)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2019-12-26 20:38:55 UTC (rev 253917)
@@ -1346,9 +1346,6 @@
case DisplayType::ListItem:
m_value.valueID = CSSValueListItem;
break;
- case DisplayType::Compact:
- m_value.valueID = CSSValueCompact;
- break;
case DisplayType::InlineBlock:
m_value.valueID = CSSValueInlineBlock;
break;
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (253916 => 253917)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2019-12-26 19:01:03 UTC (rev 253916)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2019-12-26 20:38:55 UTC (rev 253917)
@@ -433,7 +433,6 @@
inline
block
list-item
-compact
inline-block
table
inline-table
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (253916 => 253917)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2019-12-26 19:01:03 UTC (rev 253916)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2019-12-26 20:38:55 UTC (rev 253917)
@@ -164,7 +164,6 @@
case DisplayType::Block:
case DisplayType::FlowRoot:
case DisplayType::InlineBlock:
- case DisplayType::Compact:
return createRenderer<RenderBlockFlow>(element, WTFMove(style));
case DisplayType::ListItem:
return createRenderer<RenderListItem>(element, WTFMove(style));
Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (253916 => 253917)
--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2019-12-26 19:01:03 UTC (rev 253916)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2019-12-26 20:38:55 UTC (rev 253917)
@@ -87,7 +87,7 @@
|| style.display() == DisplayType::TableRow || style.display() == DisplayType::TableColumnGroup || style.display() == DisplayType::TableColumn
|| style.display() == DisplayType::TableCell || style.display() == DisplayType::TableCaption)
style.setDisplay(DisplayType::InlineBlock);
- else if (style.display() == DisplayType::Compact || style.display() == DisplayType::ListItem || style.display() == DisplayType::Table)
+ else if (style.display() == DisplayType::ListItem || style.display() == DisplayType::Table)
style.setDisplay(DisplayType::Block);
if (userAgentAppearanceStyle && isControlStyled(style, *userAgentAppearanceStyle)) {
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp (253916 => 253917)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp 2019-12-26 19:01:03 UTC (rev 253916)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp 2019-12-26 20:38:55 UTC (rev 253917)
@@ -416,7 +416,6 @@
case DisplayType::Inline: ts << "inline"; break;
case DisplayType::Block: ts << "block"; break;
case DisplayType::ListItem: ts << "list-item"; break;
- case DisplayType::Compact: ts << "compact"; break;
case DisplayType::InlineBlock: ts << "inline-block"; break;
case DisplayType::Table: ts << "table"; break;
case DisplayType::InlineTable: ts << "inline-table"; break;
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (253916 => 253917)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2019-12-26 19:01:03 UTC (rev 253916)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2019-12-26 20:38:55 UTC (rev 253917)
@@ -872,7 +872,6 @@
Inline,
Block,
ListItem,
- Compact,
InlineBlock,
Table,
InlineTable,
Modified: trunk/Source/WebCore/style/StyleAdjuster.cpp (253916 => 253917)
--- trunk/Source/WebCore/style/StyleAdjuster.cpp 2019-12-26 19:01:03 UTC (rev 253916)
+++ trunk/Source/WebCore/style/StyleAdjuster.cpp 2019-12-26 20:38:55 UTC (rev 253917)
@@ -115,7 +115,6 @@
return DisplayType::Grid;
case DisplayType::Inline:
- case DisplayType::Compact:
case DisplayType::InlineBlock:
case DisplayType::TableRowGroup:
case DisplayType::TableHeaderGroup:
