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

Side by Side Diff: Source/core/css/CSSParser.cpp

Issue 17601010: [CSS Grid Layout] Rename grid placement properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: missing webposed/ changes Created 7 years, 5 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 | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSProperty.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 2423 matching lines...) Expand 10 before | Expand all | Expand 10 after
2434 return false; 2434 return false;
2435 parsedValue = parseGridTrackSize(*m_valueList); 2435 parsedValue = parseGridTrackSize(*m_valueList);
2436 break; 2436 break;
2437 2437
2438 case CSSPropertyGridDefinitionColumns: 2438 case CSSPropertyGridDefinitionColumns:
2439 case CSSPropertyGridDefinitionRows: 2439 case CSSPropertyGridDefinitionRows:
2440 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) 2440 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
2441 return false; 2441 return false;
2442 return parseGridTrackList(propId, important); 2442 return parseGridTrackList(propId, important);
2443 2443
2444 case CSSPropertyGridStart: 2444 case CSSPropertyGridColumnEnd:
2445 case CSSPropertyGridEnd: 2445 case CSSPropertyGridColumnStart:
2446 case CSSPropertyGridBefore: 2446 case CSSPropertyGridRowEnd:
2447 case CSSPropertyGridAfter: 2447 case CSSPropertyGridRowStart:
2448 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) 2448 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
2449 return false; 2449 return false;
2450 parsedValue = parseGridPosition(); 2450 parsedValue = parseGridPosition();
2451 break; 2451 break;
2452 2452
2453 case CSSPropertyGridColumn: 2453 case CSSPropertyGridColumn:
2454 case CSSPropertyGridRow: 2454 case CSSPropertyGridRow:
2455 case CSSPropertyGridArea: 2455 case CSSPropertyGridArea:
2456 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) 2456 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
2457 return false; 2457 return false;
(...skipping 9413 matching lines...) Expand 10 before | Expand all | Expand 10 after
11871 { 11871 {
11872 // The tokenizer checks for the construct of an+b. 11872 // The tokenizer checks for the construct of an+b.
11873 // However, since the {ident} rule precedes the {nth} rule, some of those 11873 // However, since the {ident} rule precedes the {nth} rule, some of those
11874 // tokens are identified as string literal. Furthermore we need to accept 11874 // tokens are identified as string literal. Furthermore we need to accept
11875 // "odd" and "even" which does not match to an+b. 11875 // "odd" and "even" which does not match to an+b.
11876 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11876 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11877 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11877 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11878 } 11878 }
11879 11879
11880 } 11880 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSProperty.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698