[CSS Grid Layout] Incorrect sizing of tracks with non-spanning items

Source/core/rendering/style/GridTrackSize.h

Index: Source/core/rendering/style/GridTrackSize.h
diff --git a/Source/core/rendering/style/GridTrackSize.h b/Source/core/rendering/style/GridTrackSize.h
index 26d5745d0cebc9849e4be3cac0066b59fa1ed568..a116be27de4537b5e0aa9902fca873114c76282f 100644
--- a/Source/core/rendering/style/GridTrackSize.h
+++ b/Source/core/rendering/style/GridTrackSize.h
@@ -105,18 +105,21 @@ public:
 
     void cacheMinMaxTrackBreadthTypes()
     {
-        bool minTrackBreadthIsMinContent = minTrackBreadth().isLength() && minTrackBreadth().length().isMinContent();
+        m_minTrackBreadthIsMinContent = minTrackBreadth().isLength() && minTrackBreadth().length().isMinContent();
         m_minTrackBreadthIsMaxContent = minTrackBreadth().isLength() && minTrackBreadth().length().isMaxContent();
-        m_minTrackBreadthIsMinOrMaxContent = m_minTrackBreadthIsMaxContent || minTrackBreadthIsMinContent;
+        m_minTrackBreadthIsMinOrMaxContent = m_minTrackBreadthIsMaxContent || m_minTrackBreadthIsMinContent;
         m_maxTrackBreadthIsMaxContent = maxTrackBreadth().isLength() && maxTrackBreadth().length().isMaxContent();
-        m_maxTrackBreadthIsMinOrMaxContent = m_maxTrackBreadthIsMaxContent || (maxTrackBreadth().isLength() && maxTrackBreadth().length().isMinContent());
-        m_minTrackBreadthIsMinContentAndMaxTrackBreadthIsMinOrMaxContent = minTrackBreadthIsMinContent && m_maxTrackBreadthIsMinOrMaxContent;
+        m_maxTrackBreadthIsMinContent = maxTrackBreadth().isLength() && maxTrackBreadth().length().isMinContent();
+        m_maxTrackBreadthIsMinOrMaxContent = m_maxTrackBreadthIsMaxContent || m_maxTrackBreadthIsMinContent;

[Julien - ping for review, 2015/01/02 10:56:39]

We don't need the *minOrMaxContent members anymore. We should just return
*minContent || *maxContent in the getter below.

[svillar, 2015/01/02 11:36:54]

Correct. Will fix that.

+        m_minTrackBreadthIsMinContentAndMaxTrackBreadthIsMinOrMaxContent = m_minTrackBreadthIsMinContent && m_maxTrackBreadthIsMinOrMaxContent;
     }
 
     bool hasMinOrMaxContentMinTrackBreadth() const { return m_minTrackBreadthIsMinOrMaxContent; }
     bool hasMaxContentMinTrackBreadth() const { return m_minTrackBreadthIsMaxContent; }
+    bool hasMinContentMinTrackBreadth() const { return m_minTrackBreadthIsMinContent; }
     bool hasMinOrMaxContentMaxTrackBreadth() const { return m_maxTrackBreadthIsMinOrMaxContent; }
     bool hasMaxContentMaxTrackBreadth() const { return m_maxTrackBreadthIsMaxContent; }
+    bool hasMinContentMaxTrackBreadth() const { return m_maxTrackBreadthIsMinContent; }
     bool hasMinContentMinTrackBreadthAndMinOrMaxContentMaxTrackBreadth() const { return m_minTrackBreadthIsMinContentAndMaxTrackBreadthIsMinOrMaxContent; }
     bool hasMaxContentMinTrackBreadthAndMaxContentMaxTrackBreadth() const { return m_minTrackBreadthIsMaxContent && m_maxTrackBreadthIsMaxContent; }
 
@@ -126,8 +129,10 @@ private:
     GridLength m_maxTrackBreadth;
     bool m_minTrackBreadthIsMinOrMaxContent;
     bool m_minTrackBreadthIsMaxContent;
+    bool m_minTrackBreadthIsMinContent;
     bool m_maxTrackBreadthIsMinOrMaxContent;
     bool m_maxTrackBreadthIsMaxContent;
+    bool m_maxTrackBreadthIsMinContent;
     bool m_minTrackBreadthIsMinContentAndMaxTrackBreadthIsMinOrMaxContent;
 };