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

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: Fixed a bug in parseColor uncovered by the patch Created 6 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/frame/UseCounter.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 (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 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 float flexShrink() const { return rareNonInheritedData->m_flexibleBox->m_fle xShrink; } 758 float flexShrink() const { return rareNonInheritedData->m_flexibleBox->m_fle xShrink; }
759 Length flexBasis() const { return rareNonInheritedData->m_flexibleBox->m_fle xBasis; } 759 Length flexBasis() const { return rareNonInheritedData->m_flexibleBox->m_fle xBasis; }
760 EAlignContent alignContent() const { return static_cast<EAlignContent>(rareN onInheritedData->m_alignContent); } 760 EAlignContent alignContent() const { return static_cast<EAlignContent>(rareN onInheritedData->m_alignContent); }
761 EAlignItems alignItems() const { return static_cast<EAlignItems>(rareNonInhe ritedData->m_alignItems); } 761 EAlignItems alignItems() const { return static_cast<EAlignItems>(rareNonInhe ritedData->m_alignItems); }
762 EAlignItems alignSelf() const { return static_cast<EAlignItems>(rareNonInher itedData->m_alignSelf); } 762 EAlignItems alignSelf() const { return static_cast<EAlignItems>(rareNonInher itedData->m_alignSelf); }
763 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); } 763 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); }
764 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; } 764 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; }
765 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; } 765 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; }
766 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); } 766 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); }
767 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); } 767 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); }
768 JustifySelf justifySelf() const { return static_cast<JustifySelf>(rareNonInh eritedData->m_justifySelf); }
769 JustifySelfOverflowAlignment justifySelfOverflowAlignment() const { return s tatic_cast<JustifySelfOverflowAlignment>(rareNonInheritedData->m_justifySelfOver flowAlignment); }
768 770
769 const Vector<GridTrackSize>& gridDefinitionColumns() const { return rareNonI nheritedData->m_grid->m_gridDefinitionColumns; } 771 const Vector<GridTrackSize>& gridDefinitionColumns() const { return rareNonI nheritedData->m_grid->m_gridDefinitionColumns; }
770 const Vector<GridTrackSize>& gridDefinitionRows() const { return rareNonInhe ritedData->m_grid->m_gridDefinitionRows; } 772 const Vector<GridTrackSize>& gridDefinitionRows() const { return rareNonInhe ritedData->m_grid->m_gridDefinitionRows; }
771 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; } 773 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; }
772 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; } 774 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; }
773 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; } 775 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; }
774 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN onInheritedData->m_grid->m_orderedNamedGridRowLines; } 776 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN onInheritedData->m_grid->m_orderedNamedGridRowLines; }
775 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; } 777 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; }
776 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid-> m_namedGridAreaRowCount; } 778 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid-> m_namedGridAreaRowCount; }
777 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri d->m_namedGridAreaColumnCount; } 779 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri d->m_namedGridAreaColumnCount; }
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
1233 void setFlexShrink(float f) { SET_VAR(rareNonInheritedData.access()->m_flexi bleBox, m_flexShrink, f); } 1235 void setFlexShrink(float f) { SET_VAR(rareNonInheritedData.access()->m_flexi bleBox, m_flexShrink, f); }
1234 void setFlexBasis(Length length) { SET_VAR(rareNonInheritedData.access()->m_ flexibleBox, m_flexBasis, length); } 1236 void setFlexBasis(Length length) { SET_VAR(rareNonInheritedData.access()->m_ flexibleBox, m_flexBasis, length); }
1235 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, o); } 1237 void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, o); }
1236 void addCallbackSelector(const String& selector); 1238 void addCallbackSelector(const String& selector);
1237 void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alig nContent, p); } 1239 void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alig nContent, p); }
1238 void setAlignItems(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignIte ms, a); } 1240 void setAlignItems(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignIte ms, a); }
1239 void setAlignSelf(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignSelf , a); } 1241 void setAlignSelf(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignSelf , a); }
1240 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); } 1242 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); }
1241 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); } 1243 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); }
1242 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); } 1244 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); }
1245 void setJustifySelf(JustifySelf justifySelf) { SET_VAR(rareNonInheritedData, m_justifySelf, justifySelf); }
1246 void setJustifySelfOverflowAlignment(JustifySelfOverflowAlignment overflowAl ignment) { SET_VAR(rareNonInheritedData, m_justifySelfOverflowAlignment, overflo wAlignment); }
1243 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); } 1247 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); }
1244 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); } 1248 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); }
1245 void setGridDefinitionColumns(const Vector<GridTrackSize>& lengths) { SET_VA R(rareNonInheritedData.access()->m_grid, m_gridDefinitionColumns, lengths); } 1249 void setGridDefinitionColumns(const Vector<GridTrackSize>& lengths) { SET_VA R(rareNonInheritedData.access()->m_grid, m_gridDefinitionColumns, lengths); }
1246 void setGridDefinitionRows(const Vector<GridTrackSize>& lengths) { SET_VAR(r areNonInheritedData.access()->m_grid, m_gridDefinitionRows, lengths); } 1250 void setGridDefinitionRows(const Vector<GridTrackSize>& lengths) { SET_VAR(r areNonInheritedData.access()->m_grid, m_gridDefinitionRows, lengths); }
1247 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); } 1251 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); }
1248 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); } 1252 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); }
1249 void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedName dGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedName dGridColumnLines, orderedNamedGridColumnLines); } 1253 void setOrderedNamedGridColumnLines(const OrderedNamedGridLines& orderedName dGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedName dGridColumnLines, orderedNamedGridColumnLines); }
1250 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR owLines, orderedNamedGridRowLines); } 1254 void setOrderedNamedGridRowLines(const OrderedNamedGridLines& orderedNamedGr idRowLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_orderedNamedGridR owLines, orderedNamedGridRowLines); }
1251 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); } 1255 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); }
1252 void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedDat a.access()->m_grid, m_namedGridAreaRowCount, rowCount); } 1256 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
1596 static float initialFlexGrow() { return 0; } 1600 static float initialFlexGrow() { return 0; }
1597 static float initialFlexShrink() { return 1; } 1601 static float initialFlexShrink() { return 1; }
1598 static Length initialFlexBasis() { return Length(Auto); } 1602 static Length initialFlexBasis() { return Length(Auto); }
1599 static int initialOrder() { return 0; } 1603 static int initialOrder() { return 0; }
1600 static EAlignContent initialAlignContent() { return AlignContentStretch; } 1604 static EAlignContent initialAlignContent() { return AlignContentStretch; }
1601 static EAlignItems initialAlignItems() { return AlignStretch; } 1605 static EAlignItems initialAlignItems() { return AlignStretch; }
1602 static EAlignItems initialAlignSelf() { return AlignAuto; } 1606 static EAlignItems initialAlignSelf() { return AlignAuto; }
1603 static EFlexDirection initialFlexDirection() { return FlowRow; } 1607 static EFlexDirection initialFlexDirection() { return FlowRow; }
1604 static EFlexWrap initialFlexWrap() { return FlexNoWrap; } 1608 static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
1605 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; } 1609 static EJustifyContent initialJustifyContent() { return JustifyFlexStart; }
1610 static JustifySelf initialJustifySelf() { return JustifySelfAuto; }
1611 static JustifySelfOverflowAlignment initialJustifySelfOverflowAlignment() { return JustifySelfOverflowAlignmentDefault; }
1606 static int initialMarqueeLoopCount() { return -1; } 1612 static int initialMarqueeLoopCount() { return -1; }
1607 static int initialMarqueeSpeed() { return 85; } 1613 static int initialMarqueeSpeed() { return 85; }
1608 static Length initialMarqueeIncrement() { return Length(6, Fixed); } 1614 static Length initialMarqueeIncrement() { return Length(6, Fixed); }
1609 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; } 1615 static EMarqueeBehavior initialMarqueeBehavior() { return MSCROLL; }
1610 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; } 1616 static EMarqueeDirection initialMarqueeDirection() { return MAUTO; }
1611 static EUserModify initialUserModify() { return READ_ONLY; } 1617 static EUserModify initialUserModify() { return READ_ONLY; }
1612 static EUserDrag initialUserDrag() { return DRAG_AUTO; } 1618 static EUserDrag initialUserDrag() { return DRAG_AUTO; }
1613 static EUserSelect initialUserSelect() { return SELECT_TEXT; } 1619 static EUserSelect initialUserSelect() { return SELECT_TEXT; }
1614 static TextOverflow initialTextOverflow() { return TextOverflowClip; } 1620 static TextOverflow initialTextOverflow() { return TextOverflowClip; }
1615 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; } 1621 static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; }
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
1868 inline void RenderStyle::setHasPseudoStyle(PseudoId pseudo) 1874 inline void RenderStyle::setHasPseudoStyle(PseudoId pseudo)
1869 { 1875 {
1870 ASSERT(pseudo > NOPSEUDO); 1876 ASSERT(pseudo > NOPSEUDO);
1871 ASSERT(pseudo < FIRST_INTERNAL_PSEUDOID); 1877 ASSERT(pseudo < FIRST_INTERNAL_PSEUDOID);
1872 noninherited_flags._pseudoBits |= 1 << (pseudo - 1); 1878 noninherited_flags._pseudoBits |= 1 << (pseudo - 1);
1873 } 1879 }
1874 1880
1875 } // namespace WebCore 1881 } // namespace WebCore
1876 1882
1877 #endif // RenderStyle_h 1883 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/frame/UseCounter.cpp ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698