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

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

Issue 17090005: [CSS Grid Layout] Implement 'justify-self' parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Scrubbed and rebaselined patch Created 7 years, 1 month 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 | Annotate | Revision Log
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 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 float flexShrink() const { return rareNonInheritedData->m_flexibleBox->m_fle xShrink; } 744 float flexShrink() const { return rareNonInheritedData->m_flexibleBox->m_fle xShrink; }
745 Length flexBasis() const { return rareNonInheritedData->m_flexibleBox->m_fle xBasis; } 745 Length flexBasis() const { return rareNonInheritedData->m_flexibleBox->m_fle xBasis; }
746 EAlignContent alignContent() const { return static_cast<EAlignContent>(rareN onInheritedData->m_alignContent); } 746 EAlignContent alignContent() const { return static_cast<EAlignContent>(rareN onInheritedData->m_alignContent); }
747 EAlignItems alignItems() const { return static_cast<EAlignItems>(rareNonInhe ritedData->m_alignItems); } 747 EAlignItems alignItems() const { return static_cast<EAlignItems>(rareNonInhe ritedData->m_alignItems); }
748 EAlignItems alignSelf() const { return static_cast<EAlignItems>(rareNonInher itedData->m_alignSelf); } 748 EAlignItems alignSelf() const { return static_cast<EAlignItems>(rareNonInher itedData->m_alignSelf); }
749 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); } 749 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); }
750 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; } 750 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; }
751 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; } 751 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; }
752 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); } 752 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); }
753 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); } 753 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); }
754 JustifySelf justifySelf() const { return static_cast<JustifySelf>(rareNonInh eritedData->m_justifySelf); }
755 JustifySelfOverflowAlignment justifySelfOverflowAlignment() const { return s tatic_cast<JustifySelfOverflowAlignment>(rareNonInheritedData->m_justifySelfOver flowAlignment); }
754 756
755 const Vector<GridTrackSize>& gridDefinitionColumns() const { return rareNonI nheritedData->m_grid->m_gridDefinitionColumns; } 757 const Vector<GridTrackSize>& gridDefinitionColumns() const { return rareNonI nheritedData->m_grid->m_gridDefinitionColumns; }
756 const Vector<GridTrackSize>& gridDefinitionRows() const { return rareNonInhe ritedData->m_grid->m_gridDefinitionRows; } 758 const Vector<GridTrackSize>& gridDefinitionRows() const { return rareNonInhe ritedData->m_grid->m_gridDefinitionRows; }
757 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; } 759 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; }
758 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; } 760 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; }
759 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; } 761 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; }
760 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN onInheritedData->m_grid->m_orderedNamedGridRowLines; } 762 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN onInheritedData->m_grid->m_orderedNamedGridRowLines; }
761 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; } 763 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; }
762 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid-> m_namedGridAreaRowCount; } 764 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid-> m_namedGridAreaRowCount; }
763 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri d->m_namedGridAreaColumnCount; } 765 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri d->m_namedGridAreaColumnCount; }
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 void setFlexShrink(float f) { SET_VAR(rareNonInheritedData.access()->m_flexi bleBox, m_flexShrink, f); } 1220 void setFlexShrink(float f) { SET_VAR(rareNonInheritedData.access()->m_flexi bleBox, m_flexShrink, f); }
1219 void setFlexBasis(Length length) { SET_VAR(rareNonInheritedData.access()->m_ flexibleBox, m_flexBasis, length); } 1221 void setFlexBasis(Length length) { SET_VAR(rareNonInheritedData.access()->m_ flexibleBox, m_flexBasis, length); }
1220 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, o); } 1222 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, o); }
1221 void addCallbackSelector(const String& selector); 1223 void addCallbackSelector(const String& selector);
1222 void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alig nContent, p); } 1224 void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alig nContent, p); }
1223 void setAlignItems(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignIte ms, a); } 1225 void setAlignItems(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignIte ms, a); }
1224 void setAlignSelf(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignSelf , a); } 1226 void setAlignSelf(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignSelf , a); }
1225 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); } 1227 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); }
1226 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); } 1228 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); }
1227 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); } 1229 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); }
1230 void setJustifySelf(JustifySelf justifySelf) { SET_VAR(rareNonInheritedData, m_justifySelf, justifySelf); }
1231 void setJustifySelfOverflowAlignment(JustifySelfOverflowAlignment overflowAl ignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflo wAlignment); }
1228 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); } 1232 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); }
1229 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); } 1233 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); }
1230 void setGridDefinitionColumns(const Vector<GridTrackSize>& lengths) { SET_VA R(rareNonInheritedData.access()->m_grid, m_gridDefinitionColumns, lengths); } 1234 void setGridDefinitionColumns(const Vector<GridTrackSize>& lengths) { SET_VA R(rareNonInheritedData.access()->m_grid, m_gridDefinitionColumns, lengths); }
1231 void setGridDefinitionRows(const Vector<GridTrackSize>& lengths) { SET_VAR(r areNonInheritedData.access()->m_grid, m_gridDefinitionRows, lengths); } 1235 void setGridDefinitionRows(const Vector<GridTrackSize>& lengths) { SET_VAR(r areNonInheritedData.access()->m_grid, m_gridDefinitionRows, lengths); }
1232 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); } 1236 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); }
1233 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); } 1237 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); }
1234 void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedName dGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedName dGridColumnLines, orderedNamedGridColumnLines); } 1238 void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedName dGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedName dGridColumnLines, orderedNamedGridColumnLines); }
1235 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR owLines, orderedNamedGridRowLines); } 1239 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR owLines, orderedNamedGridRowLines); }
1236 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); } 1240 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); }
1237 void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedDat a.access()->m_grid, m_namedGridAreaRowCount, rowCount); } 1241 void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedDat a.access()->m_grid, m_namedGridAreaRowCount, rowCount); }
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
1581 static float initialFlexGrow() { return 0; } 1585 static float initialFlexGrow() { return 0; }
1582 static float initialFlexShrink() { return 1; } 1586 static float initialFlexShrink() { return 1; }
1583 static Length initialFlexBasis() { return Length(Auto); } 1587 static Length initialFlexBasis() { return Length(Auto); }
1584 static int initialOrder() { return 0; } 1588 static int initialOrder() { return 0; }
1585 static EAlignContent initialAlignContent() { return AlignContentStretch; } 1589 static EAlignContent initialAlignContent() { return AlignContentStretch; }
1586 static EAlignItems initialAlignItems() { return AlignStretch; } 1590 static EAlignItems initialAlignItems() { return AlignStretch; }
1587 static EAlignItems initialAlignSelf() { return AlignAuto; } 1591 static EAlignItems initialAlignSelf() { return AlignAuto; }
1588 static EFlexDirection initialFlexDirection() { return FlowRow; } 1592 static EFlexDirection initialFlexDirection() { return FlowRow; }
1589 static EFlexWrap initialFlexWrap() { return FlexNoWrap; } 1593 static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
1590 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; } 1594 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }
1595 static JustifySelf initialJustifySelf() { return JustifySelfAuto; }
1596 static JustifySelfOverflowAlignment initialJustifySelfOverflowAlignment() { return JustifySelfOverflowAlignmentDefault; }
1591 static int initialMarqueeLoopCount() { return -1; } 1597 static int initialMarqueeLoopCount() { return -1; }
1592 static int initialMarqueeSpeed() { return 85; } 1598 static int initialMarqueeSpeed() { return 85; }
1593 static Length initialMarqueeIncrement() { return Length(6, Fixed); } 1599 static Length initialMarqueeIncrement() { return Length(6, Fixed); }
1594 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; } 1600 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; }
1595 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; } 1601 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; }
1596 static EUserModify initialUserModify() { return READ_ONLY; } 1602 static EUserModify initialUserModify() { return READ_ONLY; }
1597 static EUserDrag initialUserDrag() { return DRAG_AUTO; } 1603 static EUserDrag initialUserDrag() { return DRAG_AUTO; }
1598 static EUserSelect initialUserSelect() { return SELECT_TEXT; } 1604 static EUserSelect initialUserSelect() { return SELECT_TEXT; }
1599 static TextOverflow initialTextOverflow() { return TextOverflowClip; } 1605 static TextOverflow initialTextOverflow() { return TextOverflowClip; }
1600 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } 1606 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; }
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1848 inline void RenderStyle::setHasPseudoStyle(PseudoId pseudo) 1854 inline void RenderStyle::setHasPseudoStyle(PseudoId pseudo)
1849 { 1855 {
1850 ASSERT(pseudo > NOPSEUDO); 1856 ASSERT(pseudo > NOPSEUDO);
1851 ASSERT(pseudo < FIRST_INTERNAL_PSEUDOID); 1857 ASSERT(pseudo < FIRST_INTERNAL_PSEUDOID);
1852 noninherited_flags._pseudoBits |= 1 << (pseudo - 1); 1858 noninherited_flags._pseudoBits |= 1 << (pseudo - 1);
1853 } 1859 }
1854 1860
1855 } // namespace WebCore 1861 } // namespace WebCore
1856 1862
1857 #endif // RenderStyle_h 1863 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698