| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 735d61e6b6b9c826c0f25127308c8236197c6c26..01138fc3af3896f85994bc09bbd9a6e1cb1e0bd7 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -783,6 +783,9 @@ public:
|
| bool isReverseFlexDirection() const { return flexDirection() == FlowRowReverse || flexDirection() == FlowColumnReverse; }
|
| EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedData->m_flexibleBox->m_flexWrap); }
|
| EJustifyContent justifyContent() const { return static_cast<EJustifyContent>(rareNonInheritedData->m_justifyContent); }
|
| + ItemPosition justifyItems() const { return static_cast<ItemPosition>(rareNonInheritedData->m_justifyItems); }
|
| + OverflowAlignment justifyItemsOverflowAlignment() const { return static_cast<OverflowAlignment>(rareNonInheritedData->m_justifyItemsOverflowAlignment); }
|
| + ItemPositionType justifyItemsPositionType() const { return static_cast<ItemPositionType>(rareNonInheritedData->m_justifyItemsPositionType); }
|
| ItemPosition justifySelf() const { return static_cast<ItemPosition>(rareNonInheritedData->m_justifySelf); }
|
| OverflowAlignment justifySelfOverflowAlignment() const { return static_cast<OverflowAlignment>(rareNonInheritedData->m_justifySelfOverflowAlignment); }
|
|
|
| @@ -1276,6 +1279,9 @@ public:
|
| void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexDirection, direction); }
|
| void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexWrap, w); }
|
| void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_justifyContent, p); }
|
| + void setJustifyItems(ItemPosition justifyItems) { SET_VAR(rareNonInheritedData, m_justifyItems, justifyItems); }
|
| + void setJustifyItemsOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifyItemsOverflowAlignment, overflowAlignment); }
|
| + void setJustifyItemsPositionType(ItemPositionType positionType) { SET_VAR(rareNonInheritedData, m_justifyItemsPositionType, positionType); }
|
| void setJustifySelf(ItemPosition justifySelf) { SET_VAR(rareNonInheritedData, m_justifySelf, justifySelf); }
|
| void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment); }
|
| void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridAutoColumns, length); }
|
| @@ -1499,6 +1505,8 @@ public:
|
| bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
|
| bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
|
| bool isOriginalDisplayInlineType() const { return isDisplayInlineType(originalDisplay()); }
|
| + bool isDisplayFlexibleOrGridBox() const { return isDisplayFlexibleBox(display()) || isDisplayGridBox(display()); }
|
| +
|
|
|
| bool setWritingMode(WritingMode v)
|
| {
|
| @@ -1616,6 +1624,8 @@ public:
|
| static EFlexDirection initialFlexDirection() { return FlowRow; }
|
| static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
|
| static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }
|
| + static ItemPosition initialJustifyItems() { return ItemPositionAuto; }
|
| + static OverflowAlignment initialJustifyItemsOverflowAlignment() { return OverflowAlignmentDefault; }
|
| static ItemPosition initialJustifySelf() { return ItemPositionAuto; }
|
| static OverflowAlignment initialJustifySelfOverflowAlignment() { return OverflowAlignmentDefault; }
|
| static int initialMarqueeLoopCount() { return -1; }
|
| @@ -1746,6 +1756,16 @@ private:
|
| return isHorizontalWritingMode() ? getShadowVerticalExtent(shadow, logicalTop, logicalBottom) : getShadowHorizontalExtent(shadow, logicalTop, logicalBottom);
|
| }
|
|
|
| + bool isDisplayFlexibleBox(EDisplay display) const
|
| + {
|
| + return display == FLEX || display == INLINE_FLEX;
|
| + }
|
| +
|
| + bool isDisplayGridBox(EDisplay display) const
|
| + {
|
| + return display == GRID || display == INLINE_GRID;
|
| + }
|
| +
|
| bool isDisplayReplacedType(EDisplay display) const
|
| {
|
| return display == INLINE_BLOCK || display == INLINE_BOX || display == INLINE_FLEX
|
|
|