| Index: third_party/WebKit/Source/core/style/GridTrackSize.h
|
| diff --git a/third_party/WebKit/Source/core/style/GridTrackSize.h b/third_party/WebKit/Source/core/style/GridTrackSize.h
|
| index 6d960134de57cc74e4b561c5a1bd83f658ec3840..0063215eb4a0a615e5802e16e55d1f52486b1e8b 100644
|
| --- a/third_party/WebKit/Source/core/style/GridTrackSize.h
|
| +++ b/third_party/WebKit/Source/core/style/GridTrackSize.h
|
| @@ -119,12 +119,23 @@ class GridTrackSize {
|
| maxTrackBreadth().length().isMinContent();
|
| m_maxTrackBreadthIsAuto =
|
| maxTrackBreadth().isLength() && maxTrackBreadth().length().isAuto();
|
| +
|
| + m_minTrackBreadthIsIntrinsic = m_minTrackBreadthIsMaxContent ||
|
| + m_minTrackBreadthIsMinContent ||
|
| + m_minTrackBreadthIsAuto || isFitContent();
|
| + m_maxTrackBreadthIsIntrinsic = m_maxTrackBreadthIsMaxContent ||
|
| + m_maxTrackBreadthIsMinContent ||
|
| + m_maxTrackBreadthIsAuto || isFitContent();
|
| }
|
|
|
| bool hasIntrinsicMinTrackBreadth() const {
|
| - return m_minTrackBreadthIsMaxContent || m_minTrackBreadthIsMinContent ||
|
| - m_minTrackBreadthIsAuto;
|
| + return m_minTrackBreadthIsIntrinsic;
|
| + }
|
| +
|
| + bool hasIntrinsicMaxTrackBreadth() const {
|
| + return m_maxTrackBreadthIsIntrinsic;
|
| }
|
| +
|
| bool hasMinOrMaxContentMinTrackBreadth() const {
|
| return m_minTrackBreadthIsMaxContent || m_minTrackBreadthIsMinContent;
|
| }
|
| @@ -153,8 +164,7 @@ class GridTrackSize {
|
| }
|
| bool hasAutoOrMinContentMinTrackBreadthAndIntrinsicMaxTrackBreadth() const {
|
| return (m_minTrackBreadthIsMinContent || m_minTrackBreadthIsAuto) &&
|
| - (m_maxTrackBreadthIsMaxContent || m_maxTrackBreadthIsMinContent ||
|
| - m_maxTrackBreadthIsAuto);
|
| + m_maxTrackBreadthIsIntrinsic;
|
| }
|
|
|
| private:
|
| @@ -169,6 +179,8 @@ class GridTrackSize {
|
| bool m_minTrackBreadthIsMinContent : 1;
|
| bool m_maxTrackBreadthIsMaxContent : 1;
|
| bool m_maxTrackBreadthIsMinContent : 1;
|
| + bool m_minTrackBreadthIsIntrinsic : 1;
|
| + bool m_maxTrackBreadthIsIntrinsic : 1;
|
| };
|
|
|
| } // namespace blink
|
|
|