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

Side by Side Diff: Source/core/rendering/style/RenderStyle.h

Issue 333423005: [CSS Grid Layout] Implement 'justify-items' parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Applied suggested changes. Created 6 years, 6 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 EAlignContent alignContent() const { return static_cast<EAlignContent>(rareN onInheritedData->m_alignContent); } 778 EAlignContent alignContent() const { return static_cast<EAlignContent>(rareN onInheritedData->m_alignContent); }
779 ItemPosition alignItems() const { return static_cast<ItemPosition>(rareNonIn heritedData->m_alignItems); } 779 ItemPosition alignItems() const { return static_cast<ItemPosition>(rareNonIn heritedData->m_alignItems); }
780 OverflowAlignment alignItemsOverflowAlignment() const { return static_cast<O verflowAlignment>(rareNonInheritedData->m_alignItemsOverflowAlignment); } 780 OverflowAlignment alignItemsOverflowAlignment() const { return static_cast<O verflowAlignment>(rareNonInheritedData->m_alignItemsOverflowAlignment); }
781 ItemPosition alignSelf() const { return static_cast<ItemPosition>(rareNonInh eritedData->m_alignSelf); } 781 ItemPosition alignSelf() const { return static_cast<ItemPosition>(rareNonInh eritedData->m_alignSelf); }
782 OverflowAlignment alignSelfOverflowAlignment() const { return static_cast<Ov erflowAlignment>(rareNonInheritedData->m_alignSelfOverflowAlignment); } 782 OverflowAlignment alignSelfOverflowAlignment() const { return static_cast<Ov erflowAlignment>(rareNonInheritedData->m_alignSelfOverflowAlignment); }
783 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); } 783 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); }
784 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; } 784 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; }
785 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; } 785 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; }
786 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); } 786 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); }
787 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); } 787 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); }
788 ItemPosition justifyItems() const { return static_cast<ItemPosition>(rareNon InheritedData->m_justifyItems); }
789 OverflowAlignment justifyItemsOverflowAlignment() const { return static_cast <OverflowAlignment>(rareNonInheritedData->m_justifyItemsOverflowAlignment); }
790 LegacyPosition justifyItemsIsLegacy() const { return static_cast<LegacyPosit ion>(rareNonInheritedData->m_justifyItemsIsLegacy); }
788 ItemPosition justifySelf() const { return static_cast<ItemPosition>(rareNonI nheritedData->m_justifySelf); } 791 ItemPosition justifySelf() const { return static_cast<ItemPosition>(rareNonI nheritedData->m_justifySelf); }
789 OverflowAlignment justifySelfOverflowAlignment() const { return static_cast< OverflowAlignment>(rareNonInheritedData->m_justifySelfOverflowAlignment); } 792 OverflowAlignment justifySelfOverflowAlignment() const { return static_cast< OverflowAlignment>(rareNonInheritedData->m_justifySelfOverflowAlignment); }
790 793
791 const Vector<GridTrackSize>& gridTemplateColumns() const { return rareNonInh eritedData->m_grid->m_gridTemplateColumns; } 794 const Vector<GridTrackSize>& gridTemplateColumns() const { return rareNonInh eritedData->m_grid->m_gridTemplateColumns; }
792 const Vector<GridTrackSize>& gridTemplateRows() const { return rareNonInheri tedData->m_grid->m_gridTemplateRows; } 795 const Vector<GridTrackSize>& gridTemplateRows() const { return rareNonInheri tedData->m_grid->m_gridTemplateRows; }
793 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; } 796 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; }
794 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; } 797 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; }
795 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; } 798 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; }
796 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN onInheritedData->m_grid->m_orderedNamedGridRowLines; } 799 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN onInheritedData->m_grid->m_orderedNamedGridRowLines; }
797 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; } 800 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; }
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, max(std::numer ic_limits<int>::min() + 2, o)); } 1260 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, max(std::numer ic_limits<int>::min() + 2, o)); }
1258 void addCallbackSelector(const String& selector); 1261 void addCallbackSelector(const String& selector);
1259 void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alig nContent, p); } 1262 void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alig nContent, p); }
1260 void setAlignItems(ItemPosition a) { SET_VAR(rareNonInheritedData, m_alignIt ems, a); } 1263 void setAlignItems(ItemPosition a) { SET_VAR(rareNonInheritedData, m_alignIt ems, a); }
1261 void setAlignItemsOverflowAlignment(OverflowAlignment overflowAlignment) { S ET_VAR(rareNonInheritedData, m_alignItemsOverflowAlignment, overflowAlignment); } 1264 void setAlignItemsOverflowAlignment(OverflowAlignment overflowAlignment) { S ET_VAR(rareNonInheritedData, m_alignItemsOverflowAlignment, overflowAlignment); }
1262 void setAlignSelf(ItemPosition a) { SET_VAR(rareNonInheritedData, m_alignSel f, a); } 1265 void setAlignSelf(ItemPosition a) { SET_VAR(rareNonInheritedData, m_alignSel f, a); }
1263 void setAlignSelfOverflowAlignment(OverflowAlignment overflowAlignment) { SE T_VAR(rareNonInheritedData, m_alignSelfOverflowAlignment, overflowAlignment); } 1266 void setAlignSelfOverflowAlignment(OverflowAlignment overflowAlignment) { SE T_VAR(rareNonInheritedData, m_alignSelfOverflowAlignment, overflowAlignment); }
1264 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); } 1267 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); }
1265 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); } 1268 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); }
1266 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); } 1269 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); }
1270 void setJustifyItems(ItemPosition justifyItems) { SET_VAR(rareNonInheritedDa ta, m_justifyItems, justifyItems); }
1271 void setJustifyItemsOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifyItemsOverflowAlignment, overflowAlignmen t); }
1272 void setJustifyItemsIsLegacy(LegacyPosition isLegacy) { SET_VAR(rareNonInher itedData, m_justifyItemsIsLegacy, isLegacy); }
1267 void setJustifySelf(ItemPosition justifySelf) { SET_VAR(rareNonInheritedData , m_justifySelf, justifySelf); } 1273 void setJustifySelf(ItemPosition justifySelf) { SET_VAR(rareNonInheritedData , m_justifySelf, justifySelf); }
1268 void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment) ; } 1274 void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment) ; }
1269 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); } 1275 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); }
1270 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); } 1276 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); }
1271 void setGridTemplateColumns(const Vector<GridTrackSize>& lengths) { SET_VAR( rareNonInheritedData.access()->m_grid, m_gridTemplateColumns, lengths); } 1277 void setGridTemplateColumns(const Vector<GridTrackSize>& lengths) { SET_VAR( rareNonInheritedData.access()->m_grid, m_gridTemplateColumns, lengths); }
1272 void setGridTemplateRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rar eNonInheritedData.access()->m_grid, m_gridTemplateRows, lengths); } 1278 void setGridTemplateRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rar eNonInheritedData.access()->m_grid, m_gridTemplateRows, lengths); }
1273 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); } 1279 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); }
1274 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); } 1280 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); }
1275 void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedName dGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedName dGridColumnLines, orderedNamedGridColumnLines); } 1281 void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedName dGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedName dGridColumnLines, orderedNamedGridColumnLines); }
1276 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR owLines, orderedNamedGridRowLines); } 1282 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR owLines, orderedNamedGridRowLines); }
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1480 void setQuotes(PassRefPtr<QuotesData>); 1486 void setQuotes(PassRefPtr<QuotesData>);
1481 1487
1482 const AtomicString& hyphenString() const; 1488 const AtomicString& hyphenString() const;
1483 1489
1484 bool inheritedNotEqual(const RenderStyle*) const; 1490 bool inheritedNotEqual(const RenderStyle*) const;
1485 bool inheritedDataShared(const RenderStyle*) const; 1491 bool inheritedDataShared(const RenderStyle*) const;
1486 1492
1487 bool isDisplayReplacedType() const { return isDisplayReplacedType(display()) ; } 1493 bool isDisplayReplacedType() const { return isDisplayReplacedType(display()) ; }
1488 bool isDisplayInlineType() const { return isDisplayInlineType(display()); } 1494 bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
1489 bool isOriginalDisplayInlineType() const { return isDisplayInlineType(origin alDisplay()); } 1495 bool isOriginalDisplayInlineType() const { return isDisplayInlineType(origin alDisplay()); }
1496 bool isDisplayFlexibleOrGridBox() const { return isDisplayFlexibleBox(displa y()) || isDisplayGridBox(display()); }
1497
1490 1498
1491 bool setWritingMode(WritingMode v) 1499 bool setWritingMode(WritingMode v)
1492 { 1500 {
1493 if (v == writingMode()) 1501 if (v == writingMode())
1494 return false; 1502 return false;
1495 1503
1496 inherited_flags.m_writingMode = v; 1504 inherited_flags.m_writingMode = v;
1497 return true; 1505 return true;
1498 } 1506 }
1499 1507
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
1595 static Length initialFlexBasis() { return Length(Auto); } 1603 static Length initialFlexBasis() { return Length(Auto); }
1596 static int initialOrder() { return 0; } 1604 static int initialOrder() { return 0; }
1597 static EAlignContent initialAlignContent() { return AlignContentStretch; } 1605 static EAlignContent initialAlignContent() { return AlignContentStretch; }
1598 static ItemPosition initialAlignItems() { return ItemPositionStretch; } 1606 static ItemPosition initialAlignItems() { return ItemPositionStretch; }
1599 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; } 1607 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; }
1600 static ItemPosition initialAlignSelf() { return ItemPositionAuto; } 1608 static ItemPosition initialAlignSelf() { return ItemPositionAuto; }
1601 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl owAlignmentDefault; } 1609 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl owAlignmentDefault; }
1602 static EFlexDirection initialFlexDirection() { return FlowRow; } 1610 static EFlexDirection initialFlexDirection() { return FlowRow; }
1603 static EFlexWrap initialFlexWrap() { return FlexNoWrap; } 1611 static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
1604 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; } 1612 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }
1613 static ItemPosition initialJustifyItems() { return ItemPositionAuto; }
1614 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove rflowAlignmentDefault; }
1605 static ItemPosition initialJustifySelf() { return ItemPositionAuto; } 1615 static ItemPosition initialJustifySelf() { return ItemPositionAuto; }
1606 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over flowAlignmentDefault; } 1616 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over flowAlignmentDefault; }
1607 static int initialMarqueeLoopCount() { return -1; } 1617 static int initialMarqueeLoopCount() { return -1; }
1608 static int initialMarqueeSpeed() { return 85; } 1618 static int initialMarqueeSpeed() { return 85; }
1609 static Length initialMarqueeIncrement() { return Length(6, Fixed); } 1619 static Length initialMarqueeIncrement() { return Length(6, Fixed); }
1610 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; } 1620 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; }
1611 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; } 1621 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; }
1612 static EUserModify initialUserModify() { return READ_ONLY; } 1622 static EUserModify initialUserModify() { return READ_ONLY; }
1613 static EUserDrag initialUserDrag() { return DRAG_AUTO; } 1623 static EUserDrag initialUserDrag() { return DRAG_AUTO; }
1614 static EUserSelect initialUserSelect() { return SELECT_TEXT; } 1624 static EUserSelect initialUserSelect() { return SELECT_TEXT; }
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1725 void getShadowVerticalExtent(const ShadowList*, LayoutUnit& top, LayoutUnit& bottom) const; 1735 void getShadowVerticalExtent(const ShadowList*, LayoutUnit& top, LayoutUnit& bottom) const;
1726 void getShadowInlineDirectionExtent(const ShadowList* shadow, LayoutUnit& lo gicalLeft, LayoutUnit& logicalRight) const 1736 void getShadowInlineDirectionExtent(const ShadowList* shadow, LayoutUnit& lo gicalLeft, LayoutUnit& logicalRight) const
1727 { 1737 {
1728 return isHorizontalWritingMode() ? getShadowHorizontalExtent(shadow, log icalLeft, logicalRight) : getShadowVerticalExtent(shadow, logicalLeft, logicalRi ght); 1738 return isHorizontalWritingMode() ? getShadowHorizontalExtent(shadow, log icalLeft, logicalRight) : getShadowVerticalExtent(shadow, logicalLeft, logicalRi ght);
1729 } 1739 }
1730 void getShadowBlockDirectionExtent(const ShadowList* shadow, LayoutUnit& log icalTop, LayoutUnit& logicalBottom) const 1740 void getShadowBlockDirectionExtent(const ShadowList* shadow, LayoutUnit& log icalTop, LayoutUnit& logicalBottom) const
1731 { 1741 {
1732 return isHorizontalWritingMode() ? getShadowVerticalExtent(shadow, logic alTop, logicalBottom) : getShadowHorizontalExtent(shadow, logicalTop, logicalBot tom); 1742 return isHorizontalWritingMode() ? getShadowVerticalExtent(shadow, logic alTop, logicalBottom) : getShadowHorizontalExtent(shadow, logicalTop, logicalBot tom);
1733 } 1743 }
1734 1744
1745 bool isDisplayFlexibleBox(EDisplay display) const
1746 {
1747 return display == FLEX || display == INLINE_FLEX;
1748 }
1749
1750 bool isDisplayGridBox(EDisplay display) const
1751 {
1752 return display == GRID || display == INLINE_GRID;
1753 }
1754
1735 bool isDisplayReplacedType(EDisplay display) const 1755 bool isDisplayReplacedType(EDisplay display) const
1736 { 1756 {
1737 return display == INLINE_BLOCK || display == INLINE_BOX || display == IN LINE_FLEX 1757 return display == INLINE_BLOCK || display == INLINE_BOX || display == IN LINE_FLEX
1738 || display == INLINE_TABLE || display == INLINE_GRID; 1758 || display == INLINE_TABLE || display == INLINE_GRID;
1739 } 1759 }
1740 1760
1741 bool isDisplayInlineType(EDisplay display) const 1761 bool isDisplayInlineType(EDisplay display) const
1742 { 1762 {
1743 return display == INLINE || isDisplayReplacedType(display); 1763 return display == INLINE || isDisplayReplacedType(display);
1744 } 1764 }
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 inline bool RenderStyle::hasPseudoElementStyle() const 1901 inline bool RenderStyle::hasPseudoElementStyle() const
1882 { 1902 {
1883 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1903 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1884 } 1904 }
1885 1905
1886 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1906 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1887 1907
1888 } // namespace WebCore 1908 } // namespace WebCore
1889 1909
1890 #endif // RenderStyle_h 1910 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698