From 970f42b8d70beaa8a935dfe243bceb94fe183dec Mon Sep 17 00:00:00 2001 From: Ojan Vafai Date: Mon, 6 Apr 2015 19:19:36 -0700 Subject: [PATCH] Remove parsing for display:block/inline-block. The default is now column flexboxes, which are almost the same as blocks. R=eseidel@chromium.org Review URL: https://codereview.chromium.org/1060223002 --- engine/core/css/CSSPrimitiveValueMappings.h | 6 ------ engine/core/css/CSSValueKeywords.in | 3 +-- engine/core/css/resolver/StyleAdjuster.cpp | 12 ++---------- engine/core/css/resolver/StyleResolver.cpp | 2 +- engine/core/rendering/RenderObject.cpp | 3 --- engine/core/rendering/style/RenderStyle.cpp | 2 -- engine/core/rendering/style/RenderStyle.h | 2 +- engine/core/rendering/style/RenderStyleConstants.h | 1 - 8 files changed, 5 insertions(+), 26 deletions(-) diff --git a/engine/core/css/CSSPrimitiveValueMappings.h b/engine/core/css/CSSPrimitiveValueMappings.h index 8707e743f1d..53ae82e0842 100644 --- a/engine/core/css/CSSPrimitiveValueMappings.h +++ b/engine/core/css/CSSPrimitiveValueMappings.h @@ -867,12 +867,6 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e) case PARAGRAPH: m_value.valueID = CSSValueParagraph; break; - case BLOCK: - m_value.valueID = CSSValueBlock; - break; - case INLINE_BLOCK: - m_value.valueID = CSSValueInlineBlock; - break; case FLEX: m_value.valueID = CSSValueFlex; break; diff --git a/engine/core/css/CSSValueKeywords.in b/engine/core/css/CSSValueKeywords.in index 22e1342d653..b67f809e425 100644 --- a/engine/core/css/CSSValueKeywords.in +++ b/engine/core/css/CSSValueKeywords.in @@ -262,8 +262,6 @@ inline // Contains only inline content. paragraph // Contains only block content. -block -inline-block flex inline-flex //none @@ -667,6 +665,7 @@ upright vertical-right // -webkit-line-box-contain +block font glyphs inline-box diff --git a/engine/core/css/resolver/StyleAdjuster.cpp b/engine/core/css/resolver/StyleAdjuster.cpp index 8788d7450e1..55f51e57c3b 100644 --- a/engine/core/css/resolver/StyleAdjuster.cpp +++ b/engine/core/css/resolver/StyleAdjuster.cpp @@ -48,15 +48,11 @@ static EDisplay equivalentInlineDisplay(EDisplay display) case PARAGRAPH: return INLINE; - case BLOCK: - return INLINE_BLOCK; - case FLEX: return INLINE_FLEX; case INLINE: case INLINE_FLEX: - case INLINE_BLOCK: return display; case NONE: @@ -72,17 +68,13 @@ static EDisplay equivalentBlockDisplay(EDisplay display) { switch (display) { case PARAGRAPH: - case BLOCK: case FLEX: return display; + case INLINE: case INLINE_FLEX: return FLEX; - case INLINE: - case INLINE_BLOCK: - return BLOCK; - case NONE: ASSERT_NOT_REACHED(); return NONE; @@ -97,7 +89,7 @@ static EDisplay equivalentBlockDisplay(EDisplay display) // and absolute or relatively positioned elements. static bool doesNotInheritTextDecoration(const RenderStyle* style, const Element& e) { - return style->display() == INLINE_BLOCK || isAtShadowBoundary(&e) || style->hasOutOfFlowPosition(); + return isAtShadowBoundary(&e) || style->hasOutOfFlowPosition(); } static bool parentStyleForcesZIndexToCreateStackingContext(const RenderStyle* parentStyle) diff --git a/engine/core/css/resolver/StyleResolver.cpp b/engine/core/css/resolver/StyleResolver.cpp index 6bfa49fbc93..609cbdc76f1 100644 --- a/engine/core/css/resolver/StyleResolver.cpp +++ b/engine/core/css/resolver/StyleResolver.cpp @@ -172,7 +172,7 @@ void StyleResolver::matchRules(Element& element, ElementRuleCollector& collector PassRefPtr StyleResolver::styleForDocument(Document& document) { RefPtr documentStyle = RenderStyle::create(); - documentStyle->setDisplay(BLOCK); + documentStyle->setDisplay(FLEX); documentStyle->setRTLOrdering(LogicalOrder); documentStyle->setLocale(document.contentLanguage()); documentStyle->setZIndex(0); diff --git a/engine/core/rendering/RenderObject.cpp b/engine/core/rendering/RenderObject.cpp index 638e3e8b4a1..cef08494e1e 100644 --- a/engine/core/rendering/RenderObject.cpp +++ b/engine/core/rendering/RenderObject.cpp @@ -125,9 +125,6 @@ RenderObject* RenderObject::createObject(Element* element, RenderStyle* style) return 0; case INLINE: return new RenderInline(element); - case BLOCK: - case INLINE_BLOCK: - return new RenderBlockFlow(element); case PARAGRAPH: return new RenderParagraph(element); case FLEX: diff --git a/engine/core/rendering/style/RenderStyle.cpp b/engine/core/rendering/style/RenderStyle.cpp index 5ec984dfd6e..841ecc9323b 100644 --- a/engine/core/rendering/style/RenderStyle.cpp +++ b/engine/core/rendering/style/RenderStyle.cpp @@ -234,10 +234,8 @@ bool RenderStyle::requiresOnlyBlockChildren() case INLINE: return false; - case BLOCK: case FLEX: case INLINE_FLEX: - case INLINE_BLOCK: return true; case NONE: diff --git a/engine/core/rendering/style/RenderStyle.h b/engine/core/rendering/style/RenderStyle.h index afcfee88528..a7856e7f665 100644 --- a/engine/core/rendering/style/RenderStyle.h +++ b/engine/core/rendering/style/RenderStyle.h @@ -1261,7 +1261,7 @@ private: bool isDisplayReplacedType(EDisplay display) const { - return display == INLINE_BLOCK || display == INLINE_FLEX; + return display == INLINE_FLEX; } bool isDisplayInlineType(EDisplay display) const diff --git a/engine/core/rendering/style/RenderStyleConstants.h b/engine/core/rendering/style/RenderStyleConstants.h index aaad3f0ab49..ac6e348bb52 100644 --- a/engine/core/rendering/style/RenderStyleConstants.h +++ b/engine/core/rendering/style/RenderStyleConstants.h @@ -341,7 +341,6 @@ enum ECursor { // The order of this enum must match the order of the display values in CSSValueKeywords.in. enum EDisplay { INLINE, PARAGRAPH, - BLOCK, INLINE_BLOCK, FLEX, INLINE_FLEX, NONE, };