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

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

Issue 636993002: [CSS Grid Layout] Upgrade justify-content parsing to CSS3 Box Alignment spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
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 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 case CSSPropertyAlignItems: 507 case CSSPropertyAlignItems:
508 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code. 508 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code.
509 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStre tch; 509 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStre tch;
510 case CSSPropertyAlignSelf: 510 case CSSPropertyAlignSelf:
511 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code. 511 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code.
512 return valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueI D == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch; 512 return valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueI D == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch;
513 case CSSPropertyFlexDirection: 513 case CSSPropertyFlexDirection:
514 return valueID == CSSValueRow || valueID == CSSValueRowReverse || valueI D == CSSValueColumn || valueID == CSSValueColumnReverse; 514 return valueID == CSSValueRow || valueID == CSSValueRowReverse || valueI D == CSSValueColumn || valueID == CSSValueColumnReverse;
515 case CSSPropertyFlexWrap: 515 case CSSPropertyFlexWrap:
516 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID = = CSSValueWrapReverse; 516 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID = = CSSValueWrapReverse;
517 case CSSPropertyJustifyContent:
518 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'.
519 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround;
520 case CSSPropertyFontKerning: 517 case CSSPropertyFontKerning:
521 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID = = CSSValueNone; 518 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID = = CSSValueNone;
522 case CSSPropertyWebkitFontSmoothing: 519 case CSSPropertyWebkitFontSmoothing:
523 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased; 520 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased;
524 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space 521 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space
525 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce; 522 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce;
526 case CSSPropertyWebkitMarginAfterCollapse: 523 case CSSPropertyWebkitMarginAfterCollapse:
527 case CSSPropertyWebkitMarginBeforeCollapse: 524 case CSSPropertyWebkitMarginBeforeCollapse:
528 case CSSPropertyWebkitMarginBottomCollapse: 525 case CSSPropertyWebkitMarginBottomCollapse:
529 case CSSPropertyWebkitMarginTopCollapse: 526 case CSSPropertyWebkitMarginTopCollapse:
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 case CSSPropertyWebkitBoxOrient: 627 case CSSPropertyWebkitBoxOrient:
631 case CSSPropertyWebkitBoxPack: 628 case CSSPropertyWebkitBoxPack:
632 case CSSPropertyWebkitColumnBreakAfter: 629 case CSSPropertyWebkitColumnBreakAfter:
633 case CSSPropertyWebkitColumnBreakBefore: 630 case CSSPropertyWebkitColumnBreakBefore:
634 case CSSPropertyWebkitColumnBreakInside: 631 case CSSPropertyWebkitColumnBreakInside:
635 case CSSPropertyColumnFill: 632 case CSSPropertyColumnFill:
636 case CSSPropertyWebkitColumnRuleStyle: 633 case CSSPropertyWebkitColumnRuleStyle:
637 case CSSPropertyAlignContent: 634 case CSSPropertyAlignContent:
638 case CSSPropertyFlexDirection: 635 case CSSPropertyFlexDirection:
639 case CSSPropertyFlexWrap: 636 case CSSPropertyFlexWrap:
640 case CSSPropertyJustifyContent:
641 case CSSPropertyFontKerning: 637 case CSSPropertyFontKerning:
642 case CSSPropertyWebkitFontSmoothing: 638 case CSSPropertyWebkitFontSmoothing:
643 case CSSPropertyWebkitLineBreak: 639 case CSSPropertyWebkitLineBreak:
644 case CSSPropertyWebkitMarginAfterCollapse: 640 case CSSPropertyWebkitMarginAfterCollapse:
645 case CSSPropertyWebkitMarginBeforeCollapse: 641 case CSSPropertyWebkitMarginBeforeCollapse:
646 case CSSPropertyWebkitMarginBottomCollapse: 642 case CSSPropertyWebkitMarginBottomCollapse:
647 case CSSPropertyWebkitMarginTopCollapse: 643 case CSSPropertyWebkitMarginTopCollapse:
648 case CSSPropertyInternalMarqueeDirection: 644 case CSSPropertyInternalMarqueeDirection:
649 case CSSPropertyInternalMarqueeStyle: 645 case CSSPropertyInternalMarqueeStyle:
650 case CSSPropertyWebkitPrintColorAdjust: 646 case CSSPropertyWebkitPrintColorAdjust:
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after
2063 rule->setProperties(createStylePropertySet()); 2059 rule->setProperties(createStylePropertySet());
2064 clearProperties(); 2060 clearProperties();
2065 2061
2066 StyleRuleViewport* result = rule.get(); 2062 StyleRuleViewport* result = rule.get();
2067 m_parsedRules.append(rule.release()); 2063 m_parsedRules.append(rule.release());
2068 2064
2069 return result; 2065 return result;
2070 } 2066 }
2071 2067
2072 } 2068 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698