Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(465)

Unified Diff: sky/engine/core/css/resolver/StyleAdjuster.cpp

Issue 1060223002: Remove parsing for display:block/inline-block. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/css/CSSValueKeywords.in ('k') | sky/engine/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/StyleAdjuster.cpp
diff --git a/sky/engine/core/css/resolver/StyleAdjuster.cpp b/sky/engine/core/css/resolver/StyleAdjuster.cpp
index 8788d7450e1745760596606d9a4eeb15fdc14ad0..55f51e57c3b12a226b81f1495e1b947952a87add 100644
--- a/sky/engine/core/css/resolver/StyleAdjuster.cpp
+++ b/sky/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)
« no previous file with comments | « sky/engine/core/css/CSSValueKeywords.in ('k') | sky/engine/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698