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

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

Issue 25687002: Add support for the column-fill property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 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 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 if (valueID == CSSValueHorizontal || valueID == CSSValueVertical || valu eID == CSSValueInlineAxis || valueID == CSSValueBlockAxis) 787 if (valueID == CSSValueHorizontal || valueID == CSSValueVertical || valu eID == CSSValueInlineAxis || valueID == CSSValueBlockAxis)
788 return true; 788 return true;
789 break; 789 break;
790 case CSSPropertyWebkitBoxPack: 790 case CSSPropertyWebkitBoxPack:
791 if (valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSS ValueCenter || valueID == CSSValueJustify) 791 if (valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSS ValueCenter || valueID == CSSValueJustify)
792 return true; 792 return true;
793 break; 793 break;
794 case CSSPropertyInternalCallback: 794 case CSSPropertyInternalCallback:
795 // This property is only injected programmatically, not parsed from styl esheets. 795 // This property is only injected programmatically, not parsed from styl esheets.
796 return false; 796 return false;
797 case CSSPropertyWebkitColumnFill:
798 if (valueID == CSSValueAuto || valueID == CSSValueBalance)
799 return true;
800 break;
797 case CSSPropertyAlignContent: 801 case CSSPropertyAlignContent:
798 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || value ID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSp aceAround || valueID == CSSValueStretch) 802 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || value ID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSp aceAround || valueID == CSSValueStretch)
799 return true; 803 return true;
800 break; 804 break;
801 case CSSPropertyAlignItems: 805 case CSSPropertyAlignItems:
802 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueI D == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch ) 806 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueI D == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch )
803 return true; 807 return true;
804 break; 808 break;
805 case CSSPropertyAlignSelf: 809 case CSSPropertyAlignSelf:
806 if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID = = CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch) 810 if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID = = CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch)
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 case CSSPropertyWebkitBoxAlign: 1007 case CSSPropertyWebkitBoxAlign:
1004 case CSSPropertyWebkitBoxDecorationBreak: 1008 case CSSPropertyWebkitBoxDecorationBreak:
1005 case CSSPropertyWebkitBoxDirection: 1009 case CSSPropertyWebkitBoxDirection:
1006 case CSSPropertyWebkitBoxLines: 1010 case CSSPropertyWebkitBoxLines:
1007 case CSSPropertyWebkitBoxOrient: 1011 case CSSPropertyWebkitBoxOrient:
1008 case CSSPropertyWebkitBoxPack: 1012 case CSSPropertyWebkitBoxPack:
1009 case CSSPropertyInternalCallback: 1013 case CSSPropertyInternalCallback:
1010 case CSSPropertyWebkitColumnBreakAfter: 1014 case CSSPropertyWebkitColumnBreakAfter:
1011 case CSSPropertyWebkitColumnBreakBefore: 1015 case CSSPropertyWebkitColumnBreakBefore:
1012 case CSSPropertyWebkitColumnBreakInside: 1016 case CSSPropertyWebkitColumnBreakInside:
1017 case CSSPropertyWebkitColumnFill:
1013 case CSSPropertyWebkitColumnRuleStyle: 1018 case CSSPropertyWebkitColumnRuleStyle:
1014 case CSSPropertyAlignContent: 1019 case CSSPropertyAlignContent:
1015 case CSSPropertyAlignItems: 1020 case CSSPropertyAlignItems:
1016 case CSSPropertyAlignSelf: 1021 case CSSPropertyAlignSelf:
1017 case CSSPropertyFlexDirection: 1022 case CSSPropertyFlexDirection:
1018 case CSSPropertyFlexWrap: 1023 case CSSPropertyFlexWrap:
1019 case CSSPropertyJustifyContent: 1024 case CSSPropertyJustifyContent:
1020 case CSSPropertyWebkitFontKerning: 1025 case CSSPropertyWebkitFontKerning:
1021 case CSSPropertyWebkitFontSmoothing: 1026 case CSSPropertyWebkitFontSmoothing:
1022 case CSSPropertyGridAutoFlow: 1027 case CSSPropertyGridAutoFlow:
(...skipping 1825 matching lines...) Expand 10 before | Expand all | Expand 10 after
2848 case CSSPropertyWebkitBoxAlign: 2853 case CSSPropertyWebkitBoxAlign:
2849 case CSSPropertyWebkitBoxDecorationBreak: 2854 case CSSPropertyWebkitBoxDecorationBreak:
2850 case CSSPropertyWebkitBoxDirection: 2855 case CSSPropertyWebkitBoxDirection:
2851 case CSSPropertyWebkitBoxLines: 2856 case CSSPropertyWebkitBoxLines:
2852 case CSSPropertyWebkitBoxOrient: 2857 case CSSPropertyWebkitBoxOrient:
2853 case CSSPropertyWebkitBoxPack: 2858 case CSSPropertyWebkitBoxPack:
2854 case CSSPropertyInternalCallback: 2859 case CSSPropertyInternalCallback:
2855 case CSSPropertyWebkitColumnBreakAfter: 2860 case CSSPropertyWebkitColumnBreakAfter:
2856 case CSSPropertyWebkitColumnBreakBefore: 2861 case CSSPropertyWebkitColumnBreakBefore:
2857 case CSSPropertyWebkitColumnBreakInside: 2862 case CSSPropertyWebkitColumnBreakInside:
2863 case CSSPropertyWebkitColumnFill:
2858 case CSSPropertyWebkitColumnRuleStyle: 2864 case CSSPropertyWebkitColumnRuleStyle:
2859 case CSSPropertyAlignContent: 2865 case CSSPropertyAlignContent:
2860 case CSSPropertyAlignItems: 2866 case CSSPropertyAlignItems:
2861 case CSSPropertyAlignSelf: 2867 case CSSPropertyAlignSelf:
2862 case CSSPropertyFlexDirection: 2868 case CSSPropertyFlexDirection:
2863 case CSSPropertyFlexWrap: 2869 case CSSPropertyFlexWrap:
2864 case CSSPropertyJustifyContent: 2870 case CSSPropertyJustifyContent:
2865 case CSSPropertyWebkitFontKerning: 2871 case CSSPropertyWebkitFontKerning:
2866 case CSSPropertyWebkitFontSmoothing: 2872 case CSSPropertyWebkitFontSmoothing:
2867 case CSSPropertyGridAutoFlow: 2873 case CSSPropertyGridAutoFlow:
(...skipping 9158 matching lines...) Expand 10 before | Expand all | Expand 10 after
12026 { 12032 {
12027 // The tokenizer checks for the construct of an+b. 12033 // The tokenizer checks for the construct of an+b.
12028 // However, since the {ident} rule precedes the {nth} rule, some of those 12034 // However, since the {ident} rule precedes the {nth} rule, some of those
12029 // tokens are identified as string literal. Furthermore we need to accept 12035 // tokens are identified as string literal. Furthermore we need to accept
12030 // "odd" and "even" which does not match to an+b. 12036 // "odd" and "even" which does not match to an+b.
12031 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 12037 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
12032 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 12038 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
12033 } 12039 }
12034 12040
12035 } 12041 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698