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

Side by Side Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 166623002: [CSS Grid Layout] Introduce an explicit type for resolved grid positions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Apply suggested changes Created 6 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 5 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 6 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 8 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
9 * Copyright (C) 2012 Intel Corporation. All rights reserved. 9 * Copyright (C) 2012 Intel Corporation. All rights reserved.
10 * 10 *
(...skipping 3690 matching lines...) Expand 10 before | Expand all | Expand 10 after
3701 } 3701 }
3702 3702
3703 NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaNam e); 3703 NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaNam e);
3704 if (gridAreaIt == gridAreaMap.end()) { 3704 if (gridAreaIt == gridAreaMap.end()) {
3705 gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan(rowCount, rowCount), GridSpan(currentCol, lookAheadCol))); 3705 gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan(rowCount, rowCount), GridSpan(currentCol, lookAheadCol)));
3706 } else { 3706 } else {
3707 GridCoordinate& gridCoordinate = gridAreaIt->value; 3707 GridCoordinate& gridCoordinate = gridAreaIt->value;
3708 3708
3709 // The following checks test that the grid area is a single fill ed-in rectangle. 3709 // The following checks test that the grid area is a single fill ed-in rectangle.
3710 // 1. The new row is adjacent to the previously parsed row. 3710 // 1. The new row is adjacent to the previously parsed row.
3711 if (rowCount != gridCoordinate.rows.initialPositionIndex + 1) 3711 if (rowCount != gridCoordinate.rows.resolvedInitialPosition + 1)
3712 return nullptr; 3712 return nullptr;
3713 3713
3714 // 2. The new area starts at the same position as the previously parsed area. 3714 // 2. The new area starts at the same position as the previously parsed area.
3715 if (currentCol != gridCoordinate.columns.initialPositionIndex) 3715 if (currentCol != gridCoordinate.columns.resolvedInitialPosition )
3716 return nullptr; 3716 return nullptr;
3717 3717
3718 // 3. The new area ends at the same position as the previously p arsed area. 3718 // 3. The new area ends at the same position as the previously p arsed area.
3719 if (lookAheadCol != gridCoordinate.columns.finalPositionIndex) 3719 if (lookAheadCol != gridCoordinate.columns.resolvedFinalPosition )
3720 return nullptr; 3720 return nullptr;
3721 3721
3722 ++gridCoordinate.rows.finalPositionIndex; 3722 ++gridCoordinate.rows.resolvedFinalPosition;
3723 } 3723 }
3724 currentCol = lookAheadCol; 3724 currentCol = lookAheadCol;
3725 } 3725 }
3726 3726
3727 ++rowCount; 3727 ++rowCount;
3728 m_valueList->next(); 3728 m_valueList->next();
3729 } 3729 }
3730 3730
3731 if (!rowCount || !columnCount) 3731 if (!rowCount || !columnCount)
3732 return nullptr; 3732 return nullptr;
(...skipping 4722 matching lines...) Expand 10 before | Expand all | Expand 10 after
8455 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); 8455 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
8456 if (!seenStroke) 8456 if (!seenStroke)
8457 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) ); 8457 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) );
8458 if (!seenMarkers) 8458 if (!seenMarkers)
8459 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers )); 8459 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers ));
8460 8460
8461 return parsedValues.release(); 8461 return parsedValues.release();
8462 } 8462 }
8463 8463
8464 } // namespace WebCore 8464 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698