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

Unified Diff: third_party/WebKit/Source/core/style/GridTrackSize.h

Issue 2411673003: [css-grid] Fix intrinsic maximums resolution with fit-content and auto (Closed)
Patch Set: Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutGrid.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutGrid.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698