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

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

Issue 146773002: [CSS Grid Layout] Rename grid-definition-{columns|rows} to match the new syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed renaming issues with some tests. Created 6 years, 10 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) 2011 Google Inc. All Rights Reserved. 2 * Copyright (C) 2011 Google Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 28 matching lines...) Expand all
39 typedef HashMap<String, Vector<size_t> > NamedGridLinesMap; 39 typedef HashMap<String, Vector<size_t> > NamedGridLinesMap;
40 typedef HashMap<size_t, Vector<String>, WTF::IntHash<size_t>, WTF::UnsignedWithZ eroKeyHashTraits<size_t> > OrderedNamedGridLines; 40 typedef HashMap<size_t, Vector<String>, WTF::IntHash<size_t>, WTF::UnsignedWithZ eroKeyHashTraits<size_t> > OrderedNamedGridLines;
41 41
42 class StyleGridData : public RefCounted<StyleGridData> { 42 class StyleGridData : public RefCounted<StyleGridData> {
43 public: 43 public:
44 static PassRefPtr<StyleGridData> create() { return adoptRef(new StyleGridDat a); } 44 static PassRefPtr<StyleGridData> create() { return adoptRef(new StyleGridDat a); }
45 PassRefPtr<StyleGridData> copy() const { return adoptRef(new StyleGridData(* this)); } 45 PassRefPtr<StyleGridData> copy() const { return adoptRef(new StyleGridData(* this)); }
46 46
47 bool operator==(const StyleGridData& o) const 47 bool operator==(const StyleGridData& o) const
48 { 48 {
49 return m_gridDefinitionColumns == o.m_gridDefinitionColumns && m_gridDef initionRows == o.m_gridDefinitionRows && m_gridAutoFlow == o.m_gridAutoFlow && m _gridAutoRows == o.m_gridAutoRows && m_gridAutoColumns == o.m_gridAutoColumns && m_namedGridColumnLines == o.m_namedGridColumnLines && m_namedGridRowLines == o. m_namedGridRowLines && m_orderedNamedGridColumnLines == o.m_orderedNamedGridColu mnLines && m_orderedNamedGridRowLines == o.m_orderedNamedGridRowLines && m_named GridArea == o.m_namedGridArea && m_namedGridArea == o.m_namedGridArea && m_named GridAreaRowCount == o.m_namedGridAreaRowCount && m_namedGridAreaColumnCount == o .m_namedGridAreaColumnCount; 49 return m_gridTemplateColumns == o.m_gridTemplateColumns && m_gridTemplat eRows == o.m_gridTemplateRows && m_gridAutoFlow == o.m_gridAutoFlow && m_gridAut oRows == o.m_gridAutoRows && m_gridAutoColumns == o.m_gridAutoColumns && m_named GridColumnLines == o.m_namedGridColumnLines && m_namedGridRowLines == o.m_namedG ridRowLines && m_orderedNamedGridColumnLines == o.m_orderedNamedGridColumnLines && m_orderedNamedGridRowLines == o.m_orderedNamedGridRowLines && m_namedGridArea == o.m_namedGridArea && m_namedGridArea == o.m_namedGridArea && m_namedGridArea RowCount == o.m_namedGridAreaRowCount && m_namedGridAreaColumnCount == o.m_named GridAreaColumnCount;
50 } 50 }
51 51
52 bool operator!=(const StyleGridData& o) const 52 bool operator!=(const StyleGridData& o) const
53 { 53 {
54 return !(*this == o); 54 return !(*this == o);
55 } 55 }
56 56
57 Vector<GridTrackSize> m_gridDefinitionColumns; 57 Vector<GridTrackSize> m_gridTemplateColumns;
58 Vector<GridTrackSize> m_gridDefinitionRows; 58 Vector<GridTrackSize> m_gridTemplateRows;
59 59
60 NamedGridLinesMap m_namedGridColumnLines; 60 NamedGridLinesMap m_namedGridColumnLines;
61 NamedGridLinesMap m_namedGridRowLines; 61 NamedGridLinesMap m_namedGridRowLines;
62 62
63 // In order to reconstruct the original named grid line order, we can't rely on NamedGridLinesMap 63 // In order to reconstruct the original named grid line order, we can't rely on NamedGridLinesMap
64 // as it loses the position if multiple grid lines are set on a single track . 64 // as it loses the position if multiple grid lines are set on a single track .
65 OrderedNamedGridLines m_orderedNamedGridColumnLines; 65 OrderedNamedGridLines m_orderedNamedGridColumnLines;
66 OrderedNamedGridLines m_orderedNamedGridRowLines; 66 OrderedNamedGridLines m_orderedNamedGridRowLines;
67 67
68 GridAutoFlow m_gridAutoFlow; 68 GridAutoFlow m_gridAutoFlow;
69 69
70 GridTrackSize m_gridAutoRows; 70 GridTrackSize m_gridAutoRows;
71 GridTrackSize m_gridAutoColumns; 71 GridTrackSize m_gridAutoColumns;
72 72
73 NamedGridAreaMap m_namedGridArea; 73 NamedGridAreaMap m_namedGridArea;
74 // Because m_namedGridArea doesn't store the unnamed grid areas, we need to keep track 74 // Because m_namedGridArea doesn't store the unnamed grid areas, we need to keep track
75 // of the explicit grid size defined by both named and unnamed grid areas. 75 // of the explicit grid size defined by both named and unnamed grid areas.
76 size_t m_namedGridAreaRowCount; 76 size_t m_namedGridAreaRowCount;
77 size_t m_namedGridAreaColumnCount; 77 size_t m_namedGridAreaColumnCount;
78 78
79 private: 79 private:
80 StyleGridData(); 80 StyleGridData();
81 StyleGridData(const StyleGridData&); 81 StyleGridData(const StyleGridData&);
82 }; 82 };
83 83
84 } // namespace WebCore 84 } // namespace WebCore
85 85
86 #endif // StyleGridData_h 86 #endif // StyleGridData_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/StyleGridData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698