Chromium Code Reviews| Index: Source/core/rendering/style/GridTrackSize.h |
| diff --git a/Source/core/rendering/style/GridTrackSize.h b/Source/core/rendering/style/GridTrackSize.h |
| index 461093bb59791cea674628e66d1b627dbf1df34b..26d5745d0cebc9849e4be3cac0066b59fa1ed568 100644 |
| --- a/Source/core/rendering/style/GridTrackSize.h |
| +++ b/Source/core/rendering/style/GridTrackSize.h |
| @@ -105,16 +105,20 @@ public: |
| void cacheMinMaxTrackBreadthTypes() |
| { |
| + bool minTrackBreadthIsMinContent = minTrackBreadth().isLength() && minTrackBreadth().length().isMinContent(); |
| m_minTrackBreadthIsMaxContent = minTrackBreadth().isLength() && minTrackBreadth().length().isMaxContent(); |
| - m_minTrackBreadthIsMinOrMaxContent = m_minTrackBreadthIsMaxContent || (minTrackBreadth().isLength() && minTrackBreadth().length().isMinContent()); |
| + m_minTrackBreadthIsMinOrMaxContent = m_minTrackBreadthIsMaxContent || minTrackBreadthIsMinContent; |
| m_maxTrackBreadthIsMaxContent = maxTrackBreadth().isLength() && maxTrackBreadth().length().isMaxContent(); |
| m_maxTrackBreadthIsMinOrMaxContent = m_maxTrackBreadthIsMaxContent || (maxTrackBreadth().isLength() && maxTrackBreadth().length().isMinContent()); |
| + m_minTrackBreadthIsMinContentAndMaxTrackBreadthIsMinOrMaxContent = minTrackBreadthIsMinContent && m_maxTrackBreadthIsMinOrMaxContent; |
|
Julien - ping for review
2014/09/30 17:36:57
It seems like we should store "lower-level informa
svillar
2014/10/01 07:48:57
Yeah, that's actually what I'm partially doing by
|
| } |
| bool hasMinOrMaxContentMinTrackBreadth() const { return m_minTrackBreadthIsMinOrMaxContent; } |
| bool hasMaxContentMinTrackBreadth() const { return m_minTrackBreadthIsMaxContent; } |
| bool hasMinOrMaxContentMaxTrackBreadth() const { return m_maxTrackBreadthIsMinOrMaxContent; } |
| bool hasMaxContentMaxTrackBreadth() const { return m_maxTrackBreadthIsMaxContent; } |
| + bool hasMinContentMinTrackBreadthAndMinOrMaxContentMaxTrackBreadth() const { return m_minTrackBreadthIsMinContentAndMaxTrackBreadthIsMinOrMaxContent; } |
| + bool hasMaxContentMinTrackBreadthAndMaxContentMaxTrackBreadth() const { return m_minTrackBreadthIsMaxContent && m_maxTrackBreadthIsMaxContent; } |
| private: |
| GridTrackSizeType m_type; |
| @@ -124,6 +128,7 @@ private: |
| bool m_minTrackBreadthIsMaxContent; |
| bool m_maxTrackBreadthIsMinOrMaxContent; |
| bool m_maxTrackBreadthIsMaxContent; |
| + bool m_minTrackBreadthIsMinContentAndMaxTrackBreadthIsMinOrMaxContent; |
| }; |
| } // namespace blink |