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

Unified Diff: sky/engine/core/rendering/style/RenderStyle.h

Issue 1061163002: Remove all uses of display:block and display:inline-block. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: update one more usage 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
Index: sky/engine/core/rendering/style/RenderStyle.h
diff --git a/sky/engine/core/rendering/style/RenderStyle.h b/sky/engine/core/rendering/style/RenderStyle.h
index 2c6c3621dfa354f8a21521286a592a25ac415766..afcfee8852821cbc20c5acb5671f4a8381e19dd0 100644
--- a/sky/engine/core/rendering/style/RenderStyle.h
+++ b/sky/engine/core/rendering/style/RenderStyle.h
@@ -1111,7 +1111,7 @@ public:
static TextOrientation initialTextOrientation() { return TextOrientationVerticalRight; }
static ObjectFit initialObjectFit() { return ObjectFitFill; }
static LengthPoint initialObjectPosition() { return LengthPoint(Length(50.0, Percent), Length(50.0, Percent)); }
- static EDisplay initialDisplay() { return BLOCK; }
+ static EDisplay initialDisplay() { return FLEX; }
static EEmptyCell initialEmptyCells() { return SHOW; }
static EListStylePosition initialListStylePosition() { return OUTSIDE; }
static EListStyleType initialListStyleType() { return Disc; }
@@ -1164,7 +1164,7 @@ public:
static unsigned initialBoxOrdinalGroup() { return 1; }
static EBoxSizing initialBoxSizing() { return CONTENT_BOX; }
static float initialFlexGrow() { return 0; }
- static float initialFlexShrink() { return 1; }
+ static float initialFlexShrink() { return 0; }
static Length initialFlexBasis() { return Length(Auto); }
static int initialOrder() { return 0; }
static EAlignContent initialAlignContent() { return AlignContentStretch; }
@@ -1172,7 +1172,7 @@ public:
static OverflowAlignment initialAlignItemsOverflowAlignment() { return OverflowAlignmentDefault; }
static ItemPosition initialAlignSelf() { return ItemPositionAuto; }
static OverflowAlignment initialAlignSelfOverflowAlignment() { return OverflowAlignmentDefault; }
- static EFlexDirection initialFlexDirection() { return FlowRow; }
+ static EFlexDirection initialFlexDirection() { return FlowColumn; }
static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }
static ItemPosition initialJustifyItems() { return ItemPositionAuto; }

Powered by Google App Engine
This is Rietveld 408576698