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

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

Issue 333563003: [CSS Grid Layout] Update grid-auto-flow to the new syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Attempt 2 to fix win_blink_rel Created 6 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/CSSValueKeywords.in ('k') | Source/core/css/parser/CSSPropertyParser.h » ('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 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 return valueID == CSSValueRow || valueID == CSSValueRowReverse || valueI D == CSSValueColumn || valueID == CSSValueColumnReverse; 517 return valueID == CSSValueRow || valueID == CSSValueRowReverse || valueI D == CSSValueColumn || valueID == CSSValueColumnReverse;
518 case CSSPropertyFlexWrap: 518 case CSSPropertyFlexWrap:
519 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID = = CSSValueWrapReverse; 519 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID = = CSSValueWrapReverse;
520 case CSSPropertyJustifyContent: 520 case CSSPropertyJustifyContent:
521 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'. 521 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'.
522 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround; 522 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround;
523 case CSSPropertyFontKerning: 523 case CSSPropertyFontKerning:
524 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID = = CSSValueNone; 524 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID = = CSSValueNone;
525 case CSSPropertyWebkitFontSmoothing: 525 case CSSPropertyWebkitFontSmoothing:
526 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased; 526 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased;
527 case CSSPropertyGridAutoFlow:
528 return RuntimeEnabledFeatures::cssGridLayoutEnabled()
529 && (valueID == CSSValueNone || valueID == CSSValueRow || valueID == CSSValueColumn);
530 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space 527 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space
531 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce; 528 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce;
532 case CSSPropertyWebkitMarginAfterCollapse: 529 case CSSPropertyWebkitMarginAfterCollapse:
533 case CSSPropertyWebkitMarginBeforeCollapse: 530 case CSSPropertyWebkitMarginBeforeCollapse:
534 case CSSPropertyWebkitMarginBottomCollapse: 531 case CSSPropertyWebkitMarginBottomCollapse:
535 case CSSPropertyWebkitMarginTopCollapse: 532 case CSSPropertyWebkitMarginTopCollapse:
536 return valueID == CSSValueCollapse || valueID == CSSValueSeparate || val ueID == CSSValueDiscard; 533 return valueID == CSSValueCollapse || valueID == CSSValueSeparate || val ueID == CSSValueDiscard;
537 case CSSPropertyInternalMarqueeDirection: 534 case CSSPropertyInternalMarqueeDirection:
538 return valueID == CSSValueForwards || valueID == CSSValueBackwards || va lueID == CSSValueAhead || valueID == CSSValueReverse || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueDown 535 return valueID == CSSValueForwards || valueID == CSSValueBackwards || va lueID == CSSValueAhead || valueID == CSSValueReverse || valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueDown
539 || valueID == CSSValueUp || valueID == CSSValueAuto; 536 || valueID == CSSValueUp || valueID == CSSValueAuto;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 case CSSPropertyWebkitColumnBreakBefore: 639 case CSSPropertyWebkitColumnBreakBefore:
643 case CSSPropertyWebkitColumnBreakInside: 640 case CSSPropertyWebkitColumnBreakInside:
644 case CSSPropertyColumnFill: 641 case CSSPropertyColumnFill:
645 case CSSPropertyWebkitColumnRuleStyle: 642 case CSSPropertyWebkitColumnRuleStyle:
646 case CSSPropertyAlignContent: 643 case CSSPropertyAlignContent:
647 case CSSPropertyFlexDirection: 644 case CSSPropertyFlexDirection:
648 case CSSPropertyFlexWrap: 645 case CSSPropertyFlexWrap:
649 case CSSPropertyJustifyContent: 646 case CSSPropertyJustifyContent:
650 case CSSPropertyFontKerning: 647 case CSSPropertyFontKerning:
651 case CSSPropertyWebkitFontSmoothing: 648 case CSSPropertyWebkitFontSmoothing:
652 case CSSPropertyGridAutoFlow:
653 case CSSPropertyWebkitLineBreak: 649 case CSSPropertyWebkitLineBreak:
654 case CSSPropertyWebkitMarginAfterCollapse: 650 case CSSPropertyWebkitMarginAfterCollapse:
655 case CSSPropertyWebkitMarginBeforeCollapse: 651 case CSSPropertyWebkitMarginBeforeCollapse:
656 case CSSPropertyWebkitMarginBottomCollapse: 652 case CSSPropertyWebkitMarginBottomCollapse:
657 case CSSPropertyWebkitMarginTopCollapse: 653 case CSSPropertyWebkitMarginTopCollapse:
658 case CSSPropertyInternalMarqueeDirection: 654 case CSSPropertyInternalMarqueeDirection:
659 case CSSPropertyInternalMarqueeStyle: 655 case CSSPropertyInternalMarqueeStyle:
660 case CSSPropertyWebkitPrintColorAdjust: 656 case CSSPropertyWebkitPrintColorAdjust:
661 case CSSPropertyWebkitRtlOrdering: 657 case CSSPropertyWebkitRtlOrdering:
662 case CSSPropertyWebkitRubyPosition: 658 case CSSPropertyWebkitRubyPosition:
(...skipping 1439 matching lines...) Expand 10 before | Expand all | Expand 10 after
2102 rule->setProperties(createStylePropertySet()); 2098 rule->setProperties(createStylePropertySet());
2103 clearProperties(); 2099 clearProperties();
2104 2100
2105 StyleRuleViewport* result = rule.get(); 2101 StyleRuleViewport* result = rule.get();
2106 m_parsedRules.append(rule.release()); 2102 m_parsedRules.append(rule.release());
2107 2103
2108 return result; 2104 return result;
2109 } 2105 }
2110 2106
2111 } 2107 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698