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

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: Put changes to problematic files (for the bots) back in. 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 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 if (valueID == CSSValueHorizontal || valueID == CSSValueVertical || valu eID == CSSValueInlineAxis || valueID == CSSValueBlockAxis) 784 if (valueID == CSSValueHorizontal || valueID == CSSValueVertical || valu eID == CSSValueInlineAxis || valueID == CSSValueBlockAxis)
785 return true; 785 return true;
786 break; 786 break;
787 case CSSPropertyWebkitBoxPack: 787 case CSSPropertyWebkitBoxPack:
788 if (valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSS ValueCenter || valueID == CSSValueJustify) 788 if (valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSS ValueCenter || valueID == CSSValueJustify)
789 return true; 789 return true;
790 break; 790 break;
791 case CSSPropertyInternalCallback: 791 case CSSPropertyInternalCallback:
792 // This property is only injected programmatically, not parsed from styl esheets. 792 // This property is only injected programmatically, not parsed from styl esheets.
793 return false; 793 return false;
794 case CSSPropertyColumnFill:
795 if (RuntimeEnabledFeatures::regionBasedColumnsEnabled()) {
796 if (valueID == CSSValueAuto || valueID == CSSValueBalance)
797 return true;
798 }
799 break;
794 case CSSPropertyAlignContent: 800 case CSSPropertyAlignContent:
795 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || value ID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSp aceAround || valueID == CSSValueStretch) 801 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || value ID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSp aceAround || valueID == CSSValueStretch)
796 return true; 802 return true;
797 break; 803 break;
798 case CSSPropertyAlignItems: 804 case CSSPropertyAlignItems:
799 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueI D == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch ) 805 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueI D == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch )
800 return true; 806 return true;
801 break; 807 break;
802 case CSSPropertyAlignSelf: 808 case CSSPropertyAlignSelf:
803 if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID = = CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch) 809 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
1000 case CSSPropertyWebkitBoxAlign: 1006 case CSSPropertyWebkitBoxAlign:
1001 case CSSPropertyWebkitBoxDecorationBreak: 1007 case CSSPropertyWebkitBoxDecorationBreak:
1002 case CSSPropertyWebkitBoxDirection: 1008 case CSSPropertyWebkitBoxDirection:
1003 case CSSPropertyWebkitBoxLines: 1009 case CSSPropertyWebkitBoxLines:
1004 case CSSPropertyWebkitBoxOrient: 1010 case CSSPropertyWebkitBoxOrient:
1005 case CSSPropertyWebkitBoxPack: 1011 case CSSPropertyWebkitBoxPack:
1006 case CSSPropertyInternalCallback: 1012 case CSSPropertyInternalCallback:
1007 case CSSPropertyWebkitColumnBreakAfter: 1013 case CSSPropertyWebkitColumnBreakAfter:
1008 case CSSPropertyWebkitColumnBreakBefore: 1014 case CSSPropertyWebkitColumnBreakBefore:
1009 case CSSPropertyWebkitColumnBreakInside: 1015 case CSSPropertyWebkitColumnBreakInside:
1016 case CSSPropertyColumnFill:
1010 case CSSPropertyWebkitColumnRuleStyle: 1017 case CSSPropertyWebkitColumnRuleStyle:
1011 case CSSPropertyAlignContent: 1018 case CSSPropertyAlignContent:
1012 case CSSPropertyAlignItems: 1019 case CSSPropertyAlignItems:
1013 case CSSPropertyAlignSelf: 1020 case CSSPropertyAlignSelf:
1014 case CSSPropertyFlexDirection: 1021 case CSSPropertyFlexDirection:
1015 case CSSPropertyFlexWrap: 1022 case CSSPropertyFlexWrap:
1016 case CSSPropertyJustifyContent: 1023 case CSSPropertyJustifyContent:
1017 case CSSPropertyWebkitFontKerning: 1024 case CSSPropertyWebkitFontKerning:
1018 case CSSPropertyWebkitFontSmoothing: 1025 case CSSPropertyWebkitFontSmoothing:
1019 case CSSPropertyGridAutoFlow: 1026 case CSSPropertyGridAutoFlow:
(...skipping 1828 matching lines...) Expand 10 before | Expand all | Expand 10 after
2848 case CSSPropertyWebkitBoxAlign: 2855 case CSSPropertyWebkitBoxAlign:
2849 case CSSPropertyWebkitBoxDecorationBreak: 2856 case CSSPropertyWebkitBoxDecorationBreak:
2850 case CSSPropertyWebkitBoxDirection: 2857 case CSSPropertyWebkitBoxDirection:
2851 case CSSPropertyWebkitBoxLines: 2858 case CSSPropertyWebkitBoxLines:
2852 case CSSPropertyWebkitBoxOrient: 2859 case CSSPropertyWebkitBoxOrient:
2853 case CSSPropertyWebkitBoxPack: 2860 case CSSPropertyWebkitBoxPack:
2854 case CSSPropertyInternalCallback: 2861 case CSSPropertyInternalCallback:
2855 case CSSPropertyWebkitColumnBreakAfter: 2862 case CSSPropertyWebkitColumnBreakAfter:
2856 case CSSPropertyWebkitColumnBreakBefore: 2863 case CSSPropertyWebkitColumnBreakBefore:
2857 case CSSPropertyWebkitColumnBreakInside: 2864 case CSSPropertyWebkitColumnBreakInside:
2865 case CSSPropertyColumnFill:
2858 case CSSPropertyWebkitColumnRuleStyle: 2866 case CSSPropertyWebkitColumnRuleStyle:
2859 case CSSPropertyAlignContent: 2867 case CSSPropertyAlignContent:
2860 case CSSPropertyAlignItems: 2868 case CSSPropertyAlignItems:
2861 case CSSPropertyAlignSelf: 2869 case CSSPropertyAlignSelf:
2862 case CSSPropertyFlexDirection: 2870 case CSSPropertyFlexDirection:
2863 case CSSPropertyFlexWrap: 2871 case CSSPropertyFlexWrap:
2864 case CSSPropertyJustifyContent: 2872 case CSSPropertyJustifyContent:
2865 case CSSPropertyWebkitFontKerning: 2873 case CSSPropertyWebkitFontKerning:
2866 case CSSPropertyWebkitFontSmoothing: 2874 case CSSPropertyWebkitFontSmoothing:
2867 case CSSPropertyGridAutoFlow: 2875 case CSSPropertyGridAutoFlow:
(...skipping 9161 matching lines...) Expand 10 before | Expand all | Expand 10 after
12029 { 12037 {
12030 // The tokenizer checks for the construct of an+b. 12038 // The tokenizer checks for the construct of an+b.
12031 // However, since the {ident} rule precedes the {nth} rule, some of those 12039 // However, since the {ident} rule precedes the {nth} rule, some of those
12032 // tokens are identified as string literal. Furthermore we need to accept 12040 // tokens are identified as string literal. Furthermore we need to accept
12033 // "odd" and "even" which does not match to an+b. 12041 // "odd" and "even" which does not match to an+b.
12034 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 12042 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
12035 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 12043 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
12036 } 12044 }
12037 12045
12038 } 12046 }
OLDNEW
« no previous file with comments | « Source/core/css/CSSComputedStyleDeclaration.cpp ('k') | Source/core/css/CSSPrimitiveValueMappings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698