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

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

Issue 235663004: [CSS Grid Layout] Add GridSpan::iterator (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: New patch Created 6 years, 8 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
« no previous file with comments | « no previous file | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3898 matching lines...) Expand 10 before | Expand all | Expand 10 after
3909 } 3909 }
3910 3910
3911 NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaName); 3911 NamedGridAreaMap::iterator gridAreaIt = gridAreaMap.find(gridAreaName);
3912 if (gridAreaIt == gridAreaMap.end()) { 3912 if (gridAreaIt == gridAreaMap.end()) {
3913 gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan(rowCount, rowC ount), GridSpan(currentCol, lookAheadCol))); 3913 gridAreaMap.add(gridAreaName, GridCoordinate(GridSpan(rowCount, rowC ount), GridSpan(currentCol, lookAheadCol)));
3914 } else { 3914 } else {
3915 GridCoordinate& gridCoordinate = gridAreaIt->value; 3915 GridCoordinate& gridCoordinate = gridAreaIt->value;
3916 3916
3917 // The following checks test that the grid area is a single filled-i n rectangle. 3917 // The following checks test that the grid area is a single filled-i n rectangle.
3918 // 1. The new row is adjacent to the previously parsed row. 3918 // 1. The new row is adjacent to the previously parsed row.
3919 if (rowCount != gridCoordinate.rows.resolvedFinalPosition.toInt() + 1) 3919 if (rowCount != gridCoordinate.rows.resolvedFinalPosition.next().toI nt())
3920 return false; 3920 return false;
3921 3921
3922 // 2. The new area starts at the same position as the previously par sed area. 3922 // 2. The new area starts at the same position as the previously par sed area.
3923 if (currentCol != gridCoordinate.columns.resolvedInitialPosition.toI nt()) 3923 if (currentCol != gridCoordinate.columns.resolvedInitialPosition.toI nt())
3924 return false; 3924 return false;
3925 3925
3926 // 3. The new area ends at the same position as the previously parse d area. 3926 // 3. The new area ends at the same position as the previously parse d area.
3927 if (lookAheadCol != gridCoordinate.columns.resolvedFinalPosition.toI nt()) 3927 if (lookAheadCol != gridCoordinate.columns.resolvedFinalPosition.toI nt())
3928 return false; 3928 return false;
3929 3929
(...skipping 4547 matching lines...) Expand 10 before | Expand all | Expand 10 after
8477 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill)); 8477 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueFill));
8478 if (!seenStroke) 8478 if (!seenStroke)
8479 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) ); 8479 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueStroke) );
8480 if (!seenMarkers) 8480 if (!seenMarkers)
8481 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers )); 8481 parsedValues->append(CSSPrimitiveValue::createIdentifier(CSSValueMarkers ));
8482 8482
8483 return parsedValues.release(); 8483 return parsedValues.release();
8484 } 8484 }
8485 8485
8486 } // namespace WebCore 8486 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/RenderGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698