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

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

Issue 14786002: Allow defining named grid lines on the grid element (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaselined patch for try job / landing Created 7 years, 7 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/css/StyleResolver.cpp ('k') | Source/core/rendering/style/StyleGridData.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 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
744 EAlignItems alignItems() const { return static_cast<EAlignItems>(rareNonInhe ritedData->m_alignItems); } 744 EAlignItems alignItems() const { return static_cast<EAlignItems>(rareNonInhe ritedData->m_alignItems); }
745 EAlignItems alignSelf() const { return static_cast<EAlignItems>(rareNonInher itedData->m_alignSelf); } 745 EAlignItems alignSelf() const { return static_cast<EAlignItems>(rareNonInher itedData->m_alignSelf); }
746 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); } 746 EFlexDirection flexDirection() const { return static_cast<EFlexDirection>(ra reNonInheritedData->m_flexibleBox->m_flexDirection); }
747 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; } 747 bool isColumnFlexDirection() const { return flexDirection() == FlowColumn || flexDirection() == FlowColumnReverse; }
748 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; } 748 bool isReverseFlexDirection() const { return flexDirection() == FlowRowRever se || flexDirection() == FlowColumnReverse; }
749 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); } 749 EFlexWrap flexWrap() const { return static_cast<EFlexWrap>(rareNonInheritedD ata->m_flexibleBox->m_flexWrap); }
750 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); } 750 EJustifyContent justifyContent() const { return static_cast<EJustifyContent> (rareNonInheritedData->m_justifyContent); }
751 751
752 const Vector<GridTrackSize>& gridColumns() const { return rareNonInheritedDa ta->m_grid->m_gridColumns; } 752 const Vector<GridTrackSize>& gridColumns() const { return rareNonInheritedDa ta->m_grid->m_gridColumns; }
753 const Vector<GridTrackSize>& gridRows() const { return rareNonInheritedData- >m_grid->m_gridRows; } 753 const Vector<GridTrackSize>& gridRows() const { return rareNonInheritedData- >m_grid->m_gridRows; }
754 const NamedGridLinesMap& namedGridColumnLines() const { return rareNonInheri tedData->m_grid->m_namedGridColumnLines; }
755 const NamedGridLinesMap& namedGridRowLines() const { return rareNonInherited Data->m_grid->m_namedGridRowLines; }
754 GridAutoFlow gridAutoFlow() const { return rareNonInheritedData->m_grid->m_g ridAutoFlow; } 756 GridAutoFlow gridAutoFlow() const { return rareNonInheritedData->m_grid->m_g ridAutoFlow; }
755 const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData-> m_grid->m_gridAutoColumns; } 757 const GridTrackSize& gridAutoColumns() const { return rareNonInheritedData-> m_grid->m_gridAutoColumns; }
756 const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_g rid->m_gridAutoRows; } 758 const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_g rid->m_gridAutoRows; }
757 759
758 const GridPosition& gridStart() const { return rareNonInheritedData->m_gridI tem->m_gridStart; } 760 const GridPosition& gridStart() const { return rareNonInheritedData->m_gridI tem->m_gridStart; }
759 const GridPosition& gridEnd() const { return rareNonInheritedData->m_gridIte m->m_gridEnd; } 761 const GridPosition& gridEnd() const { return rareNonInheritedData->m_gridIte m->m_gridEnd; }
760 const GridPosition& gridBefore() const { return rareNonInheritedData->m_grid Item->m_gridBefore; } 762 const GridPosition& gridBefore() const { return rareNonInheritedData->m_grid Item->m_gridBefore; }
761 const GridPosition& gridAfter() const { return rareNonInheritedData->m_gridI tem->m_gridAfter; } 763 const GridPosition& gridAfter() const { return rareNonInheritedData->m_gridI tem->m_gridAfter; }
762 764
763 const ShadowData* boxShadow() const { return rareNonInheritedData->m_boxShad ow.get(); } 765 const ShadowData* boxShadow() const { return rareNonInheritedData->m_boxShad ow.get(); }
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alig nContent, p); } 1201 void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alig nContent, p); }
1200 void setAlignItems(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignIte ms, a); } 1202 void setAlignItems(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignIte ms, a); }
1201 void setAlignSelf(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignSelf , a); } 1203 void setAlignSelf(EAlignItems a) { SET_VAR(rareNonInheritedData, m_alignSelf , a); }
1202 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); } 1204 void setFlexDirection(EFlexDirection direction) { SET_VAR(rareNonInheritedDa ta.access()->m_flexibleBox, m_flexDirection, direction); }
1203 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); } 1205 void setFlexWrap(EFlexWrap w) { SET_VAR(rareNonInheritedData.access()->m_fle xibleBox, m_flexWrap, w); }
1204 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); } 1206 void setJustifyContent(EJustifyContent p) { SET_VAR(rareNonInheritedData, m_ justifyContent, p); }
1205 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); } 1207 void setGridAutoColumns(const GridTrackSize& length) { SET_VAR(rareNonInheri tedData.access()->m_grid, m_gridAutoColumns, length); }
1206 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); } 1208 void setGridAutoRows(const GridTrackSize& length) { SET_VAR(rareNonInherited Data.access()->m_grid, m_gridAutoRows, length); }
1207 void setGridColumns(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonI nheritedData.access()->m_grid, m_gridColumns, lengths); } 1209 void setGridColumns(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonI nheritedData.access()->m_grid, m_gridColumns, lengths); }
1208 void setGridRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInhe ritedData.access()->m_grid, m_gridRows, lengths); } 1210 void setGridRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInhe ritedData.access()->m_grid, m_gridRows, lengths); }
1211 void setNamedGridColumnLines(const NamedGridLinesMap& namedGridColumnLines) { SET_VAR(rareNonInheritedData.access()->m_grid, m_namedGridColumnLines, namedGr idColumnLines); }
1212 void setNamedGridRowLines(const NamedGridLinesMap& namedGridRowLines) { SET_ VAR(rareNonInheritedData.access()->m_grid, m_namedGridRowLines, namedGridRowLine s); }
1209 void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.acces s()->m_grid, m_gridAutoFlow, flow); } 1213 void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.acces s()->m_grid, m_gridAutoFlow, flow); }
1210 1214
1211 void setGridStart(const GridPosition& startPosition) { SET_VAR(rareNonInheri tedData.access()->m_gridItem, m_gridStart, startPosition); } 1215 void setGridStart(const GridPosition& startPosition) { SET_VAR(rareNonInheri tedData.access()->m_gridItem, m_gridStart, startPosition); }
1212 void setGridEnd(const GridPosition& endPosition) { SET_VAR(rareNonInheritedD ata.access()->m_gridItem, m_gridEnd, endPosition); } 1216 void setGridEnd(const GridPosition& endPosition) { SET_VAR(rareNonInheritedD ata.access()->m_gridItem, m_gridEnd, endPosition); }
1213 void setGridBefore(const GridPosition& beforePosition) { SET_VAR(rareNonInhe ritedData.access()->m_gridItem, m_gridBefore, beforePosition); } 1217 void setGridBefore(const GridPosition& beforePosition) { SET_VAR(rareNonInhe ritedData.access()->m_gridItem, m_gridBefore, beforePosition); }
1214 void setGridAfter(const GridPosition& afterPosition) { SET_VAR(rareNonInheri tedData.access()->m_gridItem, m_gridAfter, afterPosition); } 1218 void setGridAfter(const GridPosition& afterPosition) { SET_VAR(rareNonInheri tedData.access()->m_gridItem, m_gridAfter, afterPosition); }
1215 1219
1216 void setMarqueeIncrement(Length f) { SET_VAR(rareNonInheritedData.access()-> m_marquee, increment, f); } 1220 void setMarqueeIncrement(Length f) { SET_VAR(rareNonInheritedData.access()-> m_marquee, increment, f); }
1217 void setMarqueeSpeed(int f) { SET_VAR(rareNonInheritedData.access()->m_marqu ee, speed, f); } 1221 void setMarqueeSpeed(int f) { SET_VAR(rareNonInheritedData.access()->m_marqu ee, speed, f); }
1218 void setMarqueeDirection(EMarqueeDirection d) { SET_VAR(rareNonInheritedData .access()->m_marquee, direction, d); } 1222 void setMarqueeDirection(EMarqueeDirection d) { SET_VAR(rareNonInheritedData .access()->m_marquee, direction, d); }
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
1780 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation)) 1784 if (compareEqual(rareInheritedData->m_textOrientation, textOrientation))
1781 return false; 1785 return false;
1782 1786
1783 rareInheritedData.access()->m_textOrientation = textOrientation; 1787 rareInheritedData.access()->m_textOrientation = textOrientation;
1784 return true; 1788 return true;
1785 } 1789 }
1786 1790
1787 } // namespace WebCore 1791 } // namespace WebCore
1788 1792
1789 #endif // RenderStyle_h 1793 #endif // RenderStyle_h
OLDNEW
« no previous file with comments | « Source/core/css/StyleResolver.cpp ('k') | Source/core/rendering/style/StyleGridData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698