[css-grid] Store lines instead of tracks in GridResolvedPosition

third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ skipping 2948 matching lines @@
 
     for (size_t currentCol = 0; currentCol < columnCount; ++currentCol) {
         const String& gridAreaName = columnNames[currentCol];
 
         // Unamed areas are always valid (we consider them to be 1x1).
         if (gridAreaName == ".")
             continue;
 
         // We handle several grid areas with the same name at once to simplify the validation code.
         size_t lookAheadCol;
         for (lookAheadCol = currentCol; lookAheadCol < (columnCount - 1); ++lookAheadCol) {

[Timothy Loh, 2015/11/18 06:41:37]

Would it make sense to re-index lookAheadCol (i.e. start at currentCol+1) to
avoid the -1s/+1s/prev()?

[Manuel Rego, 2015/11/18 08:39:15]

Yeah, nice suggestion.

             if (columnNames[lookAheadCol + 1] != gridAreaName)
                 break;
         }
 
         NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaName);
         if (gridAreaIt == gridAreaMap.end()) {
-            gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan(rowCount, rowCount), GridSpan(currentCol, lookAheadCol)));
+            gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan(rowCount, rowCount + 1), GridSpan(currentCol, lookAheadCol + 1)));
         } else {
             GridCoordinate& gridCoordinate = gridAreaIt->value;
 
             // The following checks test that the grid area is a single filled-in rectangle.
             // 1. The new row is adjacent to the previously parsed row.
-            if (rowCount != gridCoordinate.rows.resolvedFinalPosition.next().toInt())
+            if (rowCount != gridCoordinate.rows.resolvedFinalPosition.toInt())
                 return false;
 
             // 2. The new area starts at the same position as the previously parsed area.
             if (currentCol != gridCoordinate.columns.resolvedInitialPosition.toInt())
                 return false;
 
             // 3. The new area ends at the same position as the previously parsed area.
-            if (lookAheadCol != gridCoordinate.columns.resolvedFinalPosition.toInt())
+            if (lookAheadCol != gridCoordinate.columns.resolvedFinalPosition.prev().toInt())
                 return false;
 
             ++gridCoordinate.rows.resolvedFinalPosition;
         }
         currentCol = lookAheadCol;
     }
 
     m_valueList->next();
     return true;
 }
@@ skipping 2877 matching lines @@
             return nullptr;
         a = args->next();
 
         argNumber++;
     }
 
     return transformValue.release();
 }
 
 } // namespace blink