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

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

Issue 16959008: [CSS Grid Layout] Rename grid-{rows|columns} to grid-definition-{rows|columns} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased 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 2416 matching lines...) Expand 10 before | Expand all | Expand 10 after
2427 return false; 2427 return false;
2428 } 2428 }
2429 2429
2430 case CSSPropertyGridAutoColumns: 2430 case CSSPropertyGridAutoColumns:
2431 case CSSPropertyGridAutoRows: 2431 case CSSPropertyGridAutoRows:
2432 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) 2432 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
2433 return false; 2433 return false;
2434 parsedValue = parseGridTrackSize(*m_valueList); 2434 parsedValue = parseGridTrackSize(*m_valueList);
2435 break; 2435 break;
2436 2436
2437 case CSSPropertyGridColumns: 2437 case CSSPropertyGridDefinitionColumns:
2438 case CSSPropertyGridRows: 2438 case CSSPropertyGridDefinitionRows:
2439 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) 2439 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
2440 return false; 2440 return false;
2441 return parseGridTrackList(propId, important); 2441 return parseGridTrackList(propId, important);
2442 2442
2443 case CSSPropertyGridStart: 2443 case CSSPropertyGridStart:
2444 case CSSPropertyGridEnd: 2444 case CSSPropertyGridEnd:
2445 case CSSPropertyGridBefore: 2445 case CSSPropertyGridBefore:
2446 case CSSPropertyGridAfter: 2446 case CSSPropertyGridAfter:
2447 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) 2447 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
2448 return false; 2448 return false;
(...skipping 9421 matching lines...) Expand 10 before | Expand all | Expand 10 after
11870 { 11870 {
11871 // The tokenizer checks for the construct of an+b. 11871 // The tokenizer checks for the construct of an+b.
11872 // However, since the {ident} rule precedes the {nth} rule, some of those 11872 // However, since the {ident} rule precedes the {nth} rule, some of those
11873 // tokens are identified as string literal. Furthermore we need to accept 11873 // tokens are identified as string literal. Furthermore we need to accept
11874 // "odd" and "even" which does not match to an+b. 11874 // "odd" and "even" which does not match to an+b.
11875 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11875 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11876 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11876 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11877 } 11877 }
11878 11878
11879 } 11879 }
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