Chromium Code Reviews
[email protected] (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Patch rebased. Created 6 years, 5 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
« Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl ('K') | « Source/core/rendering/RenderGrid.cpp ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll ([email protected]) 2 * Copyright (C) 2000 Lars Knoll ([email protected])
3 * (C) 2000 Antti Koivisto ([email protected]) 3 * (C) 2000 Antti Koivisto ([email protected])
4 * (C) 2000 Dirk Mueller ([email protected]) 4 * (C) 2000 Dirk Mueller ([email protected])
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 ([email protected]) 6 * Copyright (C) 2006 Graham Dennis ([email protected])
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 765 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 EAlignContent alignContent() const { return static_cast<EAlignContent>(rareN onInheritedData->m_alignContent); } 776 EAlignContent alignContent() const { return static_cast<EAlignContent>(rareN onInheritedData->m_alignContent); }
777 ItemPosition alignItems() const { return static_cast<ItemPosition>(rareNonIn heritedData->m_alignItems); } 777 ItemPosition alignItems() const { return static_cast<ItemPosition>(rareNonIn heritedData->m_alignItems); }
778 OverflowAlignment alignItemsOverflowAlignment() const { return static_cast<O verflowAlignment>(rareNonInheritedData->m_alignItemsOverflowAlignment); } 778 OverflowAlignment alignItemsOverflowAlignment() const { return static_cast<O verflowAlignment>(rareNonInheritedData->m_alignItemsOverflowAlignment); }
779 ItemPosition alignSelf() const { return static_cast<ItemPosition>(rareNonInh eritedData->m_alignSelf); } 779 ItemPosition alignSelf() const { return static_cast<ItemPosition>(rareNonInh eritedData->m_alignSelf); }
780 OverflowAlignment alignSelfOverflowAlignment() const { return static_cast<Ov erflowAlignment>(rareNonInheritedData->m_alignSelfOverflowAlignment); } 780 OverflowAlignment alignSelfOverflowAlignment() const { return static_cast<Ov erflowAlignment>(rareNonInheritedData->m_alignSelfOverflowAlignment); }
781 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); } 781 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); }
782 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; } 782 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; }
783 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; } 783 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; }
784 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); } 784 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); }
785 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); } 785 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); }
786 ItemPosition justifyItems() const { return static_cast<ItemPosition>(rareNon InheritedData->m_justifyItems); }
787 OverflowAlignment justifyItemsOverflowAlignment() const { return static_cast <OverflowAlignment>(rareNonInheritedData->m_justifyItemsOverflowAlignment); }
788 ItemPositionType justifyItemsPositionType() const { return static_cast<ItemP ositionType>(rareNonInheritedData->m_justifyItemsPositionType); }
786 ItemPosition justifySelf() const { return static_cast<ItemPosition>(rareNonI nheritedData->m_justifySelf); } 789 ItemPosition justifySelf() const { return static_cast<ItemPosition>(rareNonI nheritedData->m_justifySelf); }
787 OverflowAlignment justifySelfOverflowAlignment() const { return static_cast< OverflowAlignment>(rareNonInheritedData->m_justifySelfOverflowAlignment); } 790 OverflowAlignment justifySelfOverflowAlignment() const { return static_cast< OverflowAlignment>(rareNonInheritedData->m_justifySelfOverflowAlignment); }
788 791
789 const Vector<GridTrackSize>& gridTemplateColumns() const { return rareNonInh eritedData->m_grid->m_gridTemplateColumns; } 792 const Vector<GridTrackSize>& gridTemplateColumns() const { return rareNonInh eritedData->m_grid->m_gridTemplateColumns; }
790 const Vector<GridTrackSize>& gridTemplateRows() const { return rareNonInheri tedData->m_grid->m_gridTemplateRows; } 793 const Vector<GridTrackSize>& gridTemplateRows() const { return rareNonInheri tedData->m_grid->m_gridTemplateRows; }
791 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; } 794 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; }
792 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; } 795 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; }
793 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; } 796 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; }
794 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN onInheritedData->m_grid->m_orderedNamedGridRowLines; } 797 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN onInheritedData->m_grid->m_orderedNamedGridRowLines; }
795 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; } 798 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; }
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
1269 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, max(std::numer ic_limits<int>::min() + 2, o)); } 1272 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, max(std::numer ic_limits<int>::min() + 2, o)); }
1270 void addCallbackSelector(const String& selector); 1273 void addCallbackSelector(const String& selector);
1271 void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alig nContent, p); } 1274 void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alig nContent, p); }
1272 void setAlignItems(ItemPosition a) { SET_VAR(rareNonInheritedData, m_alignIt ems, a); } 1275 void setAlignItems(ItemPosition a) { SET_VAR(rareNonInheritedData, m_alignIt ems, a); }
1273 void setAlignItemsOverflowAlignment(OverflowAlignment overflowAlignment) { S ET_VAR(rareNonInheritedData, m_alignItemsOverflowAlignment, overflowAlignment); } 1276 void setAlignItemsOverflowAlignment(OverflowAlignment overflowAlignment) { S ET_VAR(rareNonInheritedData, m_alignItemsOverflowAlignment, overflowAlignment); }
1274 void setAlignSelf(ItemPosition a) { SET_VAR(rareNonInheritedData, m_alignSel f, a); } 1277 void setAlignSelf(ItemPosition a) { SET_VAR(rareNonInheritedData, m_alignSel f, a); }
1275 void setAlignSelfOverflowAlignment(OverflowAlignment overflowAlignment) { SE T_VAR(rareNonInheritedData, m_alignSelfOverflowAlignment, overflowAlignment); } 1278 void setAlignSelfOverflowAlignment(OverflowAlignment overflowAlignment) { SE T_VAR(rareNonInheritedData, m_alignSelfOverflowAlignment, overflowAlignment); }
1276 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); } 1279 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); }
1277 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); } 1280 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); }
1278 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); } 1281 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); }
1282 void setJustifyItems(ItemPosition justifyItems) { SET_VAR(rareNonInheritedDa ta, m_justifyItems, justifyItems); }
1283 void setJustifyItemsOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifyItemsOverflowAlignment, overflowAlignmen t); }
1284 void setJustifyItemsPositionType(ItemPositionType positionType) { SET_VAR(ra reNonInheritedData, m_justifyItemsPositionType, positionType); }
1279 void setJustifySelf(ItemPosition justifySelf) { SET_VAR(rareNonInheritedData , m_justifySelf, justifySelf); } 1285 void setJustifySelf(ItemPosition justifySelf) { SET_VAR(rareNonInheritedData , m_justifySelf, justifySelf); }
1280 void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment) ; } 1286 void setJustifySelfOverflowAlignment(OverflowAlignment overflowAlignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflowAlignment) ; }
1281 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); } 1287 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); }
1282 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); } 1288 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); }
1283 void setGridTemplateColumns(const Vector<GridTrackSize>& lengths) { SET_VAR( rareNonInheritedData.access()->m_grid, m_gridTemplateColumns, lengths); } 1289 void setGridTemplateColumns(const Vector<GridTrackSize>& lengths) { SET_VAR( rareNonInheritedData.access()->m_grid, m_gridTemplateColumns, lengths); }
1284 void setGridTemplateRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rar eNonInheritedData.access()->m_grid, m_gridTemplateRows, lengths); } 1290 void setGridTemplateRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rar eNonInheritedData.access()->m_grid, m_gridTemplateRows, lengths); }
1285 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); } 1291 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); }
1286 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); } 1292 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); }
1287 void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedName dGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedName dGridColumnLines, orderedNamedGridColumnLines); } 1293 void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedName dGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedName dGridColumnLines, orderedNamedGridColumnLines); }
1288 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR owLines, orderedNamedGridRowLines); } 1294 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
1492 void setQuotes(PassRefPtr<QuotesData>); 1498 void setQuotes(PassRefPtr<QuotesData>);
1493 1499
1494 const AtomicString& hyphenString() const; 1500 const AtomicString& hyphenString() const;
1495 1501
1496 bool inheritedNotEqual(const RenderStyle*) const; 1502 bool inheritedNotEqual(const RenderStyle*) const;
1497 bool inheritedDataShared(const RenderStyle*) const; 1503 bool inheritedDataShared(const RenderStyle*) const;
1498 1504
1499 bool isDisplayReplacedType() const { return isDisplayReplacedType(display()) ; } 1505 bool isDisplayReplacedType() const { return isDisplayReplacedType(display()) ; }
1500 bool isDisplayInlineType() const { return isDisplayInlineType(display()); } 1506 bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
1501 bool isOriginalDisplayInlineType() const { return isDisplayInlineType(origin alDisplay()); } 1507 bool isOriginalDisplayInlineType() const { return isDisplayInlineType(origin alDisplay()); }
1508 bool isDisplayFlexibleOrGridBox() const { return isDisplayFlexibleBox(displa y()) || isDisplayGridBox(display()); }
1509
1502 1510
1503 bool setWritingMode(WritingMode v) 1511 bool setWritingMode(WritingMode v)
1504 { 1512 {
1505 if (v == writingMode()) 1513 if (v == writingMode())
1506 return false; 1514 return false;
1507 1515
1508 inherited_flags.m_writingMode = v; 1516 inherited_flags.m_writingMode = v;
1509 return true; 1517 return true;
1510 } 1518 }
1511 1519
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
1609 static Length initialFlexBasis() { return Length(Auto); } 1617 static Length initialFlexBasis() { return Length(Auto); }
1610 static int initialOrder() { return 0; } 1618 static int initialOrder() { return 0; }
1611 static EAlignContent initialAlignContent() { return AlignContentStretch; } 1619 static EAlignContent initialAlignContent() { return AlignContentStretch; }
1612 static ItemPosition initialAlignItems() { return ItemPositionStretch; } 1620 static ItemPosition initialAlignItems() { return ItemPositionStretch; }
1613 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; } 1621 static OverflowAlignment initialAlignItemsOverflowAlignment() { return Overf lowAlignmentDefault; }
1614 static ItemPosition initialAlignSelf() { return ItemPositionAuto; } 1622 static ItemPosition initialAlignSelf() { return ItemPositionAuto; }
1615 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl owAlignmentDefault; } 1623 static OverflowAlignment initialAlignSelfOverflowAlignment() { return Overfl owAlignmentDefault; }
1616 static EFlexDirection initialFlexDirection() { return FlowRow; } 1624 static EFlexDirection initialFlexDirection() { return FlowRow; }
1617 static EFlexWrap initialFlexWrap() { return FlexNoWrap; } 1625 static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
1618 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; } 1626 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }
1627 static ItemPosition initialJustifyItems() { return ItemPositionAuto; }
1628 static OverflowAlignment initialJustifyItemsOverflowAlignment() { return Ove rflowAlignmentDefault; }
1619 static ItemPosition initialJustifySelf() { return ItemPositionAuto; } 1629 static ItemPosition initialJustifySelf() { return ItemPositionAuto; }
1620 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over flowAlignmentDefault; } 1630 static OverflowAlignment initialJustifySelfOverflowAlignment() { return Over flowAlignmentDefault; }
1621 static int initialMarqueeLoopCount() { return -1; } 1631 static int initialMarqueeLoopCount() { return -1; }
1622 static int initialMarqueeSpeed() { return 85; } 1632 static int initialMarqueeSpeed() { return 85; }
1623 static Length initialMarqueeIncrement() { return Length(6, Fixed); } 1633 static Length initialMarqueeIncrement() { return Length(6, Fixed); }
1624 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; } 1634 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; }
1625 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; } 1635 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; }
1626 static EUserModify initialUserModify() { return READ_ONLY; } 1636 static EUserModify initialUserModify() { return READ_ONLY; }
1627 static EUserDrag initialUserDrag() { return DRAG_AUTO; } 1637 static EUserDrag initialUserDrag() { return DRAG_AUTO; }
1628 static EUserSelect initialUserSelect() { return SELECT_TEXT; } 1638 static EUserSelect initialUserSelect() { return SELECT_TEXT; }
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1739 void getShadowVerticalExtent(const ShadowList*, LayoutUnit& top, LayoutUnit& bottom) const; 1749 void getShadowVerticalExtent(const ShadowList*, LayoutUnit& top, LayoutUnit& bottom) const;
1740 void getShadowInlineDirectionExtent(const ShadowList* shadow, LayoutUnit& lo gicalLeft, LayoutUnit& logicalRight) const 1750 void getShadowInlineDirectionExtent(const ShadowList* shadow, LayoutUnit& lo gicalLeft, LayoutUnit& logicalRight) const
1741 { 1751 {
1742 return isHorizontalWritingMode() ? getShadowHorizontalExtent(shadow, log icalLeft, logicalRight) : getShadowVerticalExtent(shadow, logicalLeft, logicalRi ght); 1752 return isHorizontalWritingMode() ? getShadowHorizontalExtent(shadow, log icalLeft, logicalRight) : getShadowVerticalExtent(shadow, logicalLeft, logicalRi ght);
1743 } 1753 }
1744 void getShadowBlockDirectionExtent(const ShadowList* shadow, LayoutUnit& log icalTop, LayoutUnit& logicalBottom) const 1754 void getShadowBlockDirectionExtent(const ShadowList* shadow, LayoutUnit& log icalTop, LayoutUnit& logicalBottom) const
1745 { 1755 {
1746 return isHorizontalWritingMode() ? getShadowVerticalExtent(shadow, logic alTop, logicalBottom) : getShadowHorizontalExtent(shadow, logicalTop, logicalBot tom); 1756 return isHorizontalWritingMode() ? getShadowVerticalExtent(shadow, logic alTop, logicalBottom) : getShadowHorizontalExtent(shadow, logicalTop, logicalBot tom);
1747 } 1757 }
1748 1758
1759 bool isDisplayFlexibleBox(EDisplay display) const
1760 {
1761 return display == FLEX || display == INLINE_FLEX;
1762 }
1763
1764 bool isDisplayGridBox(EDisplay display) const
1765 {
1766 return display == GRID || display == INLINE_GRID;
1767 }
1768
1749 bool isDisplayReplacedType(EDisplay display) const 1769 bool isDisplayReplacedType(EDisplay display) const
1750 { 1770 {
1751 return display == INLINE_BLOCK || display == INLINE_BOX || display == IN LINE_FLEX 1771 return display == INLINE_BLOCK || display == INLINE_BOX || display == IN LINE_FLEX
1752 || display == INLINE_TABLE || display == INLINE_GRID; 1772 || display == INLINE_TABLE || display == INLINE_GRID;
1753 } 1773 }
1754 1774
1755 bool isDisplayInlineType(EDisplay display) const 1775 bool isDisplayInlineType(EDisplay display) const
1756 { 1776 {
1757 return display == INLINE || isDisplayReplacedType(display); 1777 return display == INLINE || isDisplayReplacedType(display);
1758 } 1778 }
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1895 inline bool RenderStyle::hasPseudoElementStyle() const 1915 inline bool RenderStyle::hasPseudoElementStyle() const
1896 { 1916 {
1897 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1917 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1898 } 1918 }
1899 1919
1900 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1920 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1901 1921
1902 } // namespace WebCore 1922 } // namespace WebCore
1903 1923
1904 #endif // RenderStyle_h 1924 #endif // RenderStyle_h
OLDNEW
« Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl ('K') | « Source/core/rendering/RenderGrid.cpp ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698
OSZAR »