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

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

Issue 333563003: [CSS Grid Layout] Update grid-auto-flow to the new syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Attempt 2 to fix win_blink_rel 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
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 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 788
789 const Vector<GridTrackSize>& gridTemplateColumns() const { return rareNonInh eritedData->m_grid->m_gridTemplateColumns; } 789 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; } 790 const Vector<GridTrackSize>& gridTemplateRows() const { return rareNonInheri tedData->m_grid->m_gridTemplateRows; }
791 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; } 791 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; }
792 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; } 792 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; }
793 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; } 793 const OrderedNamedGridLines& orderedNamedGridColumnLines() const { return ra reNonInheritedData->m_grid->m_orderedNamedGridColumnLines; }
794 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN onInheritedData->m_grid->m_orderedNamedGridRowLines; } 794 const OrderedNamedGridLines& orderedNamedGridRowLines() const { return rareN onInheritedData->m_grid->m_orderedNamedGridRowLines; }
795 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; } 795 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; }
796 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid-> m_namedGridAreaRowCount; } 796 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid-> m_namedGridAreaRowCount; }
797 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri d->m_namedGridAreaColumnCount; } 797 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri d->m_namedGridAreaColumnCount; }
798 GridAutoFlow gridAutoFlow() const { return rareNonInheritedData->m_grid->m_g ridAutoFlow; } 798 GridAutoFlow gridAutoFlow() const { return static_cast<GridAutoFlow>(rareNon InheritedData->m_grid->m_gridAutoFlow); }
799 bool isGridAutoFlowDirectionRow() const { return (rareNonInheritedData->m_gr id->m_gridAutoFlow & InternalAutoFlowDirectionRow) == InternalAutoFlowDirectionR ow; }
800 bool isGridAutoFlowDirectionColumn() const { return (rareNonInheritedData->m _grid->m_gridAutoFlow & InternalAutoFlowDirectionColumn) == InternalAutoFlowDire ctionColumn; }
801 bool isGridAutoFlowAlgorithmSparse() const { return (rareNonInheritedData->m _grid->m_gridAutoFlow & InternalAutoFlowAlgorithmSparse) == InternalAutoFlowAlgo rithmSparse; }
802 bool isGridAutoFlowAlgorithmDense() const { return (rareNonInheritedData->m_ grid->m_gridAutoFlow & InternalAutoFlowAlgorithmDense) == InternalAutoFlowAlgori thmDense; }
803 bool isGridAutoFlowAlgorithmStack() const { return (rareNonInheritedData->m_ grid->m_gridAutoFlow & InternalAutoFlowAlgorithmStack) == InternalAutoFlowAlgori thmStack; }
799 const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData-> m_grid->m_gridAutoColumns; } 804 const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData-> m_grid->m_gridAutoColumns; }
800 const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_g rid->m_gridAutoRows; } 805 const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_g rid->m_gridAutoRows; }
801 806
802 const GridPosition& gridColumnStart() const { return rareNonInheritedData->m _gridItem->m_gridColumnStart; } 807 const GridPosition& gridColumnStart() const { return rareNonInheritedData->m _gridItem->m_gridColumnStart; }
803 const GridPosition& gridColumnEnd() const { return rareNonInheritedData->m_g ridItem->m_gridColumnEnd; } 808 const GridPosition& gridColumnEnd() const { return rareNonInheritedData->m_g ridItem->m_gridColumnEnd; }
804 const GridPosition& gridRowStart() const { return rareNonInheritedData->m_gr idItem->m_gridRowStart; } 809 const GridPosition& gridRowStart() const { return rareNonInheritedData->m_gr idItem->m_gridRowStart; }
805 const GridPosition& gridRowEnd() const { return rareNonInheritedData->m_grid Item->m_gridRowEnd; } 810 const GridPosition& gridRowEnd() const { return rareNonInheritedData->m_grid Item->m_gridRowEnd; }
806 811
807 ShadowList* boxShadow() const { return rareNonInheritedData->m_boxShadow.get (); } 812 ShadowList* boxShadow() const { return rareNonInheritedData->m_boxShadow.get (); }
808 void getBoxShadowExtent(LayoutUnit& top, LayoutUnit& right, LayoutUnit& bott om, LayoutUnit& left) const { getShadowExtent(boxShadow(), top, right, bottom, l eft); } 813 void getBoxShadowExtent(LayoutUnit& top, LayoutUnit& right, LayoutUnit& bott om, LayoutUnit& left) const { getShadowExtent(boxShadow(), top, right, bottom, l eft); }
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
1669 static TouchAction initialTouchAction() { return TouchActionAuto; } 1674 static TouchAction initialTouchAction() { return TouchActionAuto; }
1670 static TouchActionDelay initialTouchActionDelay() { return TouchActionDelayS cript; } 1675 static TouchActionDelay initialTouchActionDelay() { return TouchActionDelayS cript; }
1671 static ShadowList* initialBoxShadow() { return 0; } 1676 static ShadowList* initialBoxShadow() { return 0; }
1672 static ShadowList* initialTextShadow() { return 0; } 1677 static ShadowList* initialTextShadow() { return 0; }
1673 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant ; } 1678 static ScrollBehavior initialScrollBehavior() { return ScrollBehaviorInstant ; }
1674 1679
1675 // The initial value is 'none' for grid tracks. 1680 // The initial value is 'none' for grid tracks.
1676 static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<Gr idTrackSize>(); } 1681 static Vector<GridTrackSize> initialGridTemplateColumns() { return Vector<Gr idTrackSize>(); }
1677 static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridT rackSize>(); } 1682 static Vector<GridTrackSize> initialGridTemplateRows() { return Vector<GridT rackSize>(); }
1678 1683
1679 static GridAutoFlow initialGridAutoFlow() { return AutoFlowNone; } 1684 static GridAutoFlow initialGridAutoFlow() { return AutoFlowRow; }
1680 1685
1681 static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Length( Auto)); } 1686 static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Length( Auto)); }
1682 static GridTrackSize initialGridAutoRows() { return GridTrackSize(Length(Aut o)); } 1687 static GridTrackSize initialGridAutoRows() { return GridTrackSize(Length(Aut o)); }
1683 1688
1684 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin esMap(); } 1689 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin esMap(); }
1685 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM ap(); } 1690 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM ap(); }
1686 1691
1687 static OrderedNamedGridLines initialOrderedNamedGridColumnLines() { return O rderedNamedGridLines(); } 1692 static OrderedNamedGridLines initialOrderedNamedGridColumnLines() { return O rderedNamedGridLines(); }
1688 static OrderedNamedGridLines initialOrderedNamedGridRowLines() { return Orde redNamedGridLines(); } 1693 static OrderedNamedGridLines initialOrderedNamedGridRowLines() { return Orde redNamedGridLines(); }
1689 1694
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1888 inline bool RenderStyle::hasPseudoElementStyle() const 1893 inline bool RenderStyle::hasPseudoElementStyle() const
1889 { 1894 {
1890 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK; 1895 return noninherited_flags._pseudoBits & PSEUDO_ELEMENT_MASK;
1891 } 1896 }
1892 1897
1893 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&); 1898 float calcBorderRadiiConstraintScaleFor(const FloatRect&, const FloatRoundedRect ::Radii&);
1894 1899
1895 } // namespace WebCore 1900 } // namespace WebCore
1896 1901
1897 #endif // RenderStyle_h 1902 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/GridResolvedPosition.cpp ('k') | Source/core/rendering/style/RenderStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698