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

Source/core/rendering/style/GridTrackSize.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 87 matching lines @@
 
     bool isPercentage() const { return m_type == LengthTrackSizing && length().isLength() && length().length().isPercent(); }
 
     bool operator==(const GridTrackSize& other) const
     {
         return m_type == other.m_type && m_minTrackBreadth == other.m_minTrackBreadth && m_maxTrackBreadth == other.m_maxTrackBreadth;
     }
 
     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; }
 
 private:
     GridTrackSizeType m_type;
     GridLength m_minTrackBreadth;
     GridLength m_maxTrackBreadth;
     bool m_minTrackBreadthIsMinOrMaxContent;
     bool m_minTrackBreadthIsMaxContent;
+    bool m_minTrackBreadthIsMinContent;
     bool m_maxTrackBreadthIsMinOrMaxContent;
     bool m_maxTrackBreadthIsMaxContent;
+    bool m_maxTrackBreadthIsMinContent;
     bool m_minTrackBreadthIsMinContentAndMaxTrackBreadthIsMinOrMaxContent;
 };
 
 } // namespace blink
 
 #endif // GridTrackSize_h