Source/core/rendering/style/StyleGridData.h - Issue 16959008: [CSS Grid Layout] Rename grid-{rows|columns} to grid-definition-{rows|columns}

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

Issue 16959008: [CSS Grid Layout] Rename grid-{rows|columns} to grid-definition-{rows|columns} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 6 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

« LayoutTests/ietestcenter/css3/grid/grid-items-005-expected.htm ('K') | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/StyleGridData.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 26 matching lines...) Expand all Loading...
37	37

38 typedef HashMap<String, Vector<size_t> > NamedGridLinesMap;	38 typedef HashMap<String, Vector<size_t> > NamedGridLinesMap;

39	39

40 class StyleGridData : public RefCounted<StyleGridData> {	40 class StyleGridData : public RefCounted<StyleGridData> {

41 public:	41 public:

42 static PassRefPtr<StyleGridData> create() { return adoptRef(new StyleGridDat a); }	42 static PassRefPtr<StyleGridData> create() { return adoptRef(new StyleGridDat a); }

43 PassRefPtr<StyleGridData> copy() const { return adoptRef(new StyleGridData(* this)); }	43 PassRefPtr<StyleGridData> copy() const { return adoptRef(new StyleGridData(* this)); }

44	44

45 bool operator==(const StyleGridData& o) const	45 bool operator==(const StyleGridData& o) const

46 {	46 {

47 return m_gridColumns == o.m_gridColumns && m_gridRows == o.m_gridRows && m_gridAutoFlow == o.m_gridAutoFlow && m_gridAutoRows == o.m_gridAutoRows && m_g ridAutoColumns == o.m_gridAutoColumns && m_namedGridColumnLines == o.m_namedGrid ColumnLines && m_namedGridRowLines == o.m_namedGridRowLines;	47 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;

48 }	48 }

49	49

50 bool operator!=(const StyleGridData& o) const	50 bool operator!=(const StyleGridData& o) const

51 {	51 {

52 return !(*this == o);	52 return !(*this == o);

53 }	53 }

54	54

55 // FIXME: Update the naming of the following variables.	55 Vector<GridTrackSize> m_gridDefinitionColumns;

56 Vector<GridTrackSize> m_gridColumns;	56 Vector<GridTrackSize> m_gridDefinitionRows;

57 Vector<GridTrackSize> m_gridRows;

58	57

59 NamedGridLinesMap m_namedGridColumnLines;	58 NamedGridLinesMap m_namedGridColumnLines;

60 NamedGridLinesMap m_namedGridRowLines;	59 NamedGridLinesMap m_namedGridRowLines;

61	60

62 GridAutoFlow m_gridAutoFlow;	61 GridAutoFlow m_gridAutoFlow;

63	62

64 GridTrackSize m_gridAutoRows;	63 GridTrackSize m_gridAutoRows;

65 GridTrackSize m_gridAutoColumns;	64 GridTrackSize m_gridAutoColumns;

66	65

67 private:	66 private:

68 StyleGridData();	67 StyleGridData();

69 StyleGridData(const StyleGridData&);	68 StyleGridData(const StyleGridData&);

70 };	69 };

71	70

72 } // namespace WebCore	71 } // namespace WebCore

73	72

74 #endif // StyleGridData_h	73 #endif // StyleGridData_h

OLD	NEW