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

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

Issue 18532004: Implement 'grid-template' parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Same change, forgot to update css-properties-as-js-properties.html result Created 7 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 | 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 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); } 736 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); }
737 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; } 737 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; }
738 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; } 738 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; }
739 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); } 739 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); }
740 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); } 740 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); }
741 741
742 const Vector<GridTrackSize>& gridDefinitionColumns() const { return rareNonI nheritedData->m_grid->m_gridDefinitionColumns; } 742 const Vector<GridTrackSize>& gridDefinitionColumns() const { return rareNonI nheritedData->m_grid->m_gridDefinitionColumns; }
743 const Vector<GridTrackSize>& gridDefinitionRows() const { return rareNonInhe ritedData->m_grid->m_gridDefinitionRows; } 743 const Vector<GridTrackSize>& gridDefinitionRows() const { return rareNonInhe ritedData->m_grid->m_gridDefinitionRows; }
744 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; } 744 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; }
745 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; } 745 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; }
746 const NamedGridAreaMap& namedGridArea() const { return rareNonInheritedData- >m_grid->m_namedGridArea; }
747 size_t namedGridAreaRowCount() const { return rareNonInheritedData->m_grid-> m_namedGridAreaRowCount; }
748 size_t namedGridAreaColumnCount() const { return rareNonInheritedData->m_gri d->m_namedGridAreaColumnCount; }
746 GridAutoFlow gridAutoFlow() const { return rareNonInheritedData->m_grid->m_g ridAutoFlow; } 749 GridAutoFlow gridAutoFlow() const { return rareNonInheritedData->m_grid->m_g ridAutoFlow; }
747 const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData-> m_grid->m_gridAutoColumns; } 750 const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData-> m_grid->m_gridAutoColumns; }
748 const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_g rid->m_gridAutoRows; } 751 const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_g rid->m_gridAutoRows; }
749 752
750 const GridPosition& gridColumnStart() const { return rareNonInheritedData->m _gridItem->m_gridColumnStart; } 753 const GridPosition& gridColumnStart() const { return rareNonInheritedData->m _gridItem->m_gridColumnStart; }
751 const GridPosition& gridColumnEnd() const { return rareNonInheritedData->m_g ridItem->m_gridColumnEnd; } 754 const GridPosition& gridColumnEnd() const { return rareNonInheritedData->m_g ridItem->m_gridColumnEnd; }
752 const GridPosition& gridRowStart() const { return rareNonInheritedData->m_gr idItem->m_gridRowStart; } 755 const GridPosition& gridRowStart() const { return rareNonInheritedData->m_gr idItem->m_gridRowStart; }
753 const GridPosition& gridRowEnd() const { return rareNonInheritedData->m_grid Item->m_gridRowEnd; } 756 const GridPosition& gridRowEnd() const { return rareNonInheritedData->m_grid Item->m_gridRowEnd; }
754 757
755 const ShadowData* boxShadow() const { return rareNonInheritedData->m_boxShad ow.get(); } 758 const ShadowData* boxShadow() const { return rareNonInheritedData->m_boxShad ow.get(); }
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1187 void setAlignSelf(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignSelf , a); } 1190 void setAlignSelf(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignSelf , a); }
1188 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); } 1191 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); }
1189 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); } 1192 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); }
1190 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); } 1193 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); }
1191 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); } 1194 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); }
1192 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); } 1195 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); }
1193 void setGridDefinitionColumns(const Vector<GridTrackSize>& lengths) { SET_VA R(rareNonInheritedData.access()->m_grid, m_gridDefinitionColumns, lengths); } 1196 void setGridDefinitionColumns(const Vector<GridTrackSize>& lengths) { SET_VA R(rareNonInheritedData.access()->m_grid, m_gridDefinitionColumns, lengths); }
1194 void setGridDefinitionRows(const Vector<GridTrackSize>& lengths) { SET_VAR(r areNonInheritedData.access()->m_grid, m_gridDefinitionRows, lengths); } 1197 void setGridDefinitionRows(const Vector<GridTrackSize>& lengths) { SET_VAR(r areNonInheritedData.access()->m_grid, m_gridDefinitionRows, lengths); }
1195 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); } 1198 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); }
1196 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); } 1199 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); }
1200 void setNamedGridArea(const NamedGridAreaMap& namedGridArea) { SET_VAR(rareN onInheritedData.access()->m_grid, m_namedGridArea, namedGridArea); }
1201 void setNamedGridAreaRowCount(size_t rowCount) { SET_VAR(rareNonInheritedDat a.access()->m_grid, m_namedGridAreaRowCount, rowCount); }
1202 void setNamedGridAreaColumnCount(size_t columnCount) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_namedGridAreaColumnCount, columnCount); }
1197 void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.acces s()->m_grid, m_gridAutoFlow, flow); } 1203 void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.acces s()->m_grid, m_gridAutoFlow, flow); }
1198 1204
1199 void setGridColumnStart(const GridPosition& columnStartPosition) { SET_VAR(r areNonInheritedData.access()->m_gridItem, m_gridColumnStart, columnStartPosition ); } 1205 void setGridColumnStart(const GridPosition& columnStartPosition) { SET_VAR(r areNonInheritedData.access()->m_gridItem, m_gridColumnStart, columnStartPosition ); }
1200 void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_VAR(rareN onInheritedData.access()->m_gridItem, m_gridColumnEnd, columnEndPosition); } 1206 void setGridColumnEnd(const GridPosition& columnEndPosition) { SET_VAR(rareN onInheritedData.access()->m_gridItem, m_gridColumnEnd, columnEndPosition); }
1201 void setGridRowStart(const GridPosition& rowStartPosition) { SET_VAR(rareNon InheritedData.access()->m_gridItem, m_gridRowStart, rowStartPosition); } 1207 void setGridRowStart(const GridPosition& rowStartPosition) { SET_VAR(rareNon InheritedData.access()->m_gridItem, m_gridRowStart, rowStartPosition); }
1202 void setGridRowEnd(const GridPosition& rowEndPosition) { SET_VAR(rareNonInhe ritedData.access()->m_gridItem, m_gridRowEnd, rowEndPosition); } 1208 void setGridRowEnd(const GridPosition& rowEndPosition) { SET_VAR(rareNonInhe ritedData.access()->m_gridItem, m_gridRowEnd, rowEndPosition); }
1203 1209
1204 void setMarqueeIncrement(Length f) { SET_VAR(rareNonInheritedData.access()-> m_marquee, increment, f); } 1210 void setMarqueeIncrement(Length f) { SET_VAR(rareNonInheritedData.access()-> m_marquee, increment, f); }
1205 void setMarqueeSpeed(int f) { SET_VAR(rareNonInheritedData.access()->m_marqu ee, speed, f); } 1211 void setMarqueeSpeed(int f) { SET_VAR(rareNonInheritedData.access()->m_marqu ee, speed, f); }
1206 void setMarqueeDirection(EMarqueeDirection d) { SET_VAR(rareNonInheritedData .access()->m_marquee, direction, d); } 1212 void setMarqueeDirection(EMarqueeDirection d) { SET_VAR(rareNonInheritedData .access()->m_marquee, direction, d); }
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
1599 static Vector<GridTrackSize> initialGridDefinitionRows() { return Vector<Gri dTrackSize>(); } 1605 static Vector<GridTrackSize> initialGridDefinitionRows() { return Vector<Gri dTrackSize>(); }
1600 1606
1601 static GridAutoFlow initialGridAutoFlow() { return AutoFlowNone; } 1607 static GridAutoFlow initialGridAutoFlow() { return AutoFlowNone; }
1602 1608
1603 static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Auto); } 1609 static GridTrackSize initialGridAutoColumns() { return GridTrackSize(Auto); }
1604 static GridTrackSize initialGridAutoRows() { return GridTrackSize(Auto); } 1610 static GridTrackSize initialGridAutoRows() { return GridTrackSize(Auto); }
1605 1611
1606 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin esMap(); } 1612 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin esMap(); }
1607 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM ap(); } 1613 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM ap(); }
1608 1614
1615 static NamedGridAreaMap initialNamedGridArea() { return NamedGridAreaMap(); }
1616 static size_t initialNamedGridAreaCount() { return 0; }
1617
1609 // 'auto' is the default. 1618 // 'auto' is the default.
1610 static GridPosition initialGridColumnStart() { return GridPosition(); } 1619 static GridPosition initialGridColumnStart() { return GridPosition(); }
1611 static GridPosition initialGridColumnEnd() { return GridPosition(); } 1620 static GridPosition initialGridColumnEnd() { return GridPosition(); }
1612 static GridPosition initialGridRowStart() { return GridPosition(); } 1621 static GridPosition initialGridRowStart() { return GridPosition(); }
1613 static GridPosition initialGridRowEnd() { return GridPosition(); } 1622 static GridPosition initialGridRowEnd() { return GridPosition(); }
1614 1623
1615 static unsigned initialTabSize() { return 8; } 1624 static unsigned initialTabSize() { return 8; }
1616 1625
1617 static const AtomicString& initialLineGrid() { return nullAtom; } 1626 static const AtomicString& initialLineGrid() { return nullAtom; }
1618 static LineSnap initialLineSnap() { return LineSnapNone; } 1627 static LineSnap initialLineSnap() { return LineSnapNone; }
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1754 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1763 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1755 return false; 1764 return false;
1756 1765
1757 rareInheritedData.access()->m_textOrientation = textOrientation; 1766 rareInheritedData.access()->m_textOrientation = textOrientation;
1758 return true; 1767 return true;
1759 } 1768 }
1760 1769
1761 } // namespace WebCore 1770 } // namespace WebCore
1762 1771
1763 #endif // RenderStyle_h 1772 #endif // RenderStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698