Source/core/rendering/style/GridTrackSize.h - Issue 60633008: [CSS Grid Layout] Percentages of indefinite sizes should compute to "auto"

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

Issue 60633008: [CSS Grid Layout] Percentages of indefinite sizes should compute to "auto" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Use isIntrinsicOrAuto() + tests updated Created 7 years 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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 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 are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 102 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
113 m_minTrackBreadth = minTrackBreadth;	113 m_minTrackBreadth = minTrackBreadth;

114 m_maxTrackBreadth = maxTrackBreadth;	114 m_maxTrackBreadth = maxTrackBreadth;

115	115

116 cacheMinMaxTrackBreadthTypes();	116 cacheMinMaxTrackBreadthTypes();

117 }	117 }

118	118

119 GridTrackSizeType type() const { return m_type; }	119 GridTrackSizeType type() const { return m_type; }

120	120

121 bool isContentSized() const { return m_minTrackBreadth.isContentSized() \|\| m _maxTrackBreadth.isContentSized(); }	121 bool isContentSized() const { return m_minTrackBreadth.isContentSized() \|\| m _maxTrackBreadth.isContentSized(); }

122	122

	123 bool isPercentage() const { return m_type == LengthTrackSizing && length().i sLength() && length().length().isPercent(); }

	124

123 bool operator==(const GridTrackSize& other) const	125 bool operator==(const GridTrackSize& other) const

124 {	126 {

125 return m_type == other.m_type && m_minTrackBreadth == other.m_minTrackBr eadth && m_maxTrackBreadth == other.m_maxTrackBreadth;	127 return m_type == other.m_type && m_minTrackBreadth == other.m_minTrackBr eadth && m_maxTrackBreadth == other.m_maxTrackBreadth;

126 }	128 }

127	129

128 void cacheMinMaxTrackBreadthTypes()	130 void cacheMinMaxTrackBreadthTypes()

129 {	131 {

130 m_minTrackBreadthIsMaxContent = minTrackBreadth().isLength() && minTrack Breadth().length().isMaxContent();	132 m_minTrackBreadthIsMaxContent = minTrackBreadth().isLength() && minTrack Breadth().length().isMaxContent();

131 m_minTrackBreadthIsMinOrMaxContent = m_minTrackBreadthIsMaxContent \|\| (m inTrackBreadth().isLength() && minTrackBreadth().length().isMinContent());	133 m_minTrackBreadthIsMinOrMaxContent = m_minTrackBreadthIsMaxContent \|\| (m inTrackBreadth().isLength() && minTrackBreadth().length().isMinContent());

132 m_maxTrackBreadthIsMaxContent = maxTrackBreadth().isLength() && maxTrack Breadth().length().isMaxContent();	134 m_maxTrackBreadthIsMaxContent = maxTrackBreadth().isLength() && maxTrack Breadth().length().isMaxContent();

(...skipping 11 matching lines...) Expand all Loading...
144 GridLength m_maxTrackBreadth;	146 GridLength m_maxTrackBreadth;

145 bool m_minTrackBreadthIsMinOrMaxContent;	147 bool m_minTrackBreadthIsMinOrMaxContent;

146 bool m_minTrackBreadthIsMaxContent;	148 bool m_minTrackBreadthIsMaxContent;

147 bool m_maxTrackBreadthIsMinOrMaxContent;	149 bool m_maxTrackBreadthIsMinOrMaxContent;

148 bool m_maxTrackBreadthIsMaxContent;	150 bool m_maxTrackBreadthIsMaxContent;

149 };	151 };

150	152

151 } // namespace WebCore	153 } // namespace WebCore

152	154

153 #endif // GridTrackSize_h	155 #endif // GridTrackSize_h

OLD	NEW

« no previous file with comments | « Source/core/rendering/RenderGrid.cpp ('k') | no next file » | no next file with comments »