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

Side by Side Diff: Source/core/css/parser/BisonCSSParser-in.cpp

Issue 146773002: [CSS Grid Layout] Rename grid-definition-{columns|rows} to match the new syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed renaming issues with some tests. Created 6 years, 10 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/RuntimeCSSEnabled.cpp ('k') | Source/core/css/resolver/StyleBuilderCustom.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 2438 matching lines...) Expand 10 before | Expand all | Expand 10 after
2449 return false; 2449 return false;
2450 2450
2451 return parseItemPositionOverflowPosition(propId, important); 2451 return parseItemPositionOverflowPosition(propId, important);
2452 case CSSPropertyGridAutoColumns: 2452 case CSSPropertyGridAutoColumns:
2453 case CSSPropertyGridAutoRows: 2453 case CSSPropertyGridAutoRows:
2454 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) 2454 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
2455 return false; 2455 return false;
2456 parsedValue = parseGridTrackSize(*m_valueList); 2456 parsedValue = parseGridTrackSize(*m_valueList);
2457 break; 2457 break;
2458 2458
2459 case CSSPropertyGridDefinitionColumns: 2459 case CSSPropertyGridTemplateColumns:
2460 case CSSPropertyGridDefinitionRows: 2460 case CSSPropertyGridTemplateRows:
2461 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) 2461 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
2462 return false; 2462 return false;
2463 return parseGridTrackList(propId, important); 2463 return parseGridTrackList(propId, important);
2464 2464
2465 case CSSPropertyGridColumnEnd: 2465 case CSSPropertyGridColumnEnd:
2466 case CSSPropertyGridColumnStart: 2466 case CSSPropertyGridColumnStart:
2467 case CSSPropertyGridRowEnd: 2467 case CSSPropertyGridRowEnd:
2468 case CSSPropertyGridRowStart: 2468 case CSSPropertyGridRowStart:
2469 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled()) 2469 if (!RuntimeEnabledFeatures::cssGridLayoutEnabled())
2470 return false; 2470 return false;
(...skipping 7814 matching lines...) Expand 10 before | Expand all | Expand 10 after
10285 { 10285 {
10286 // The tokenizer checks for the construct of an+b. 10286 // The tokenizer checks for the construct of an+b.
10287 // However, since the {ident} rule precedes the {nth} rule, some of those 10287 // However, since the {ident} rule precedes the {nth} rule, some of those
10288 // tokens are identified as string literal. Furthermore we need to accept 10288 // tokens are identified as string literal. Furthermore we need to accept
10289 // "odd" and "even" which does not match to an+b. 10289 // "odd" and "even" which does not match to an+b.
10290 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 10290 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
10291 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 10291 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
10292 } 10292 }
10293 10293
10294 } 10294 }
OLDNEW
« no previous file with comments | « Source/core/css/RuntimeCSSEnabled.cpp ('k') | Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698