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

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

Issue 16690004: [CSS Regions] Rename region-overflow to region-fragment (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch Created 7 years, 6 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 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 break; 847 break;
848 case CSSPropertyWebkitRegionBreakAfter: 848 case CSSPropertyWebkitRegionBreakAfter:
849 case CSSPropertyWebkitRegionBreakBefore: 849 case CSSPropertyWebkitRegionBreakBefore:
850 if (RuntimeEnabledFeatures::cssRegionsEnabled() && (valueID == CSSValueA uto || valueID == CSSValueAlways || valueID == CSSValueAvoid || valueID == CSSVa lueLeft || valueID == CSSValueRight)) 850 if (RuntimeEnabledFeatures::cssRegionsEnabled() && (valueID == CSSValueA uto || valueID == CSSValueAlways || valueID == CSSValueAvoid || valueID == CSSVa lueLeft || valueID == CSSValueRight))
851 return true; 851 return true;
852 break; 852 break;
853 case CSSPropertyWebkitRegionBreakInside: 853 case CSSPropertyWebkitRegionBreakInside:
854 if (RuntimeEnabledFeatures::cssRegionsEnabled() && (valueID == CSSValueA uto || valueID == CSSValueAvoid)) 854 if (RuntimeEnabledFeatures::cssRegionsEnabled() && (valueID == CSSValueA uto || valueID == CSSValueAvoid))
855 return true; 855 return true;
856 break; 856 break;
857 case CSSPropertyWebkitRegionOverflow: 857 case CSSPropertyWebkitRegionFragment:
858 if (RuntimeEnabledFeatures::cssRegionsEnabled() && (valueID == CSSValueA uto || valueID == CSSValueBreak)) 858 if (RuntimeEnabledFeatures::cssRegionsEnabled() && (valueID == CSSValueA uto || valueID == CSSValueBreak))
859 return true; 859 return true;
860 break; 860 break;
861 case CSSPropertyWebkitRtlOrdering: 861 case CSSPropertyWebkitRtlOrdering:
862 if (valueID == CSSValueLogical || valueID == CSSValueVisual) 862 if (valueID == CSSValueLogical || valueID == CSSValueVisual)
863 return true; 863 return true;
864 break; 864 break;
865 865
866 case CSSPropertyWebkitRubyPosition: 866 case CSSPropertyWebkitRubyPosition:
867 if (valueID == CSSValueBefore || valueID == CSSValueAfter) 867 if (valueID == CSSValueBefore || valueID == CSSValueAfter)
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 case CSSPropertyWebkitMarginTopCollapse: 1015 case CSSPropertyWebkitMarginTopCollapse:
1016 case CSSPropertyWebkitMarqueeDirection: 1016 case CSSPropertyWebkitMarqueeDirection:
1017 case CSSPropertyWebkitMarqueeStyle: 1017 case CSSPropertyWebkitMarqueeStyle:
1018 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 1018 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
1019 case CSSPropertyWebkitOverflowScrolling: 1019 case CSSPropertyWebkitOverflowScrolling:
1020 #endif 1020 #endif
1021 case CSSPropertyWebkitPrintColorAdjust: 1021 case CSSPropertyWebkitPrintColorAdjust:
1022 case CSSPropertyWebkitRegionBreakAfter: 1022 case CSSPropertyWebkitRegionBreakAfter:
1023 case CSSPropertyWebkitRegionBreakBefore: 1023 case CSSPropertyWebkitRegionBreakBefore:
1024 case CSSPropertyWebkitRegionBreakInside: 1024 case CSSPropertyWebkitRegionBreakInside:
1025 case CSSPropertyWebkitRegionOverflow: 1025 case CSSPropertyWebkitRegionFragment:
1026 case CSSPropertyWebkitRtlOrdering: 1026 case CSSPropertyWebkitRtlOrdering:
1027 case CSSPropertyWebkitRubyPosition: 1027 case CSSPropertyWebkitRubyPosition:
1028 #if ENABLE(CSS3_TEXT) 1028 #if ENABLE(CSS3_TEXT)
1029 case CSSPropertyWebkitTextAlignLast: 1029 case CSSPropertyWebkitTextAlignLast:
1030 #endif // CSS3_TEXT 1030 #endif // CSS3_TEXT
1031 case CSSPropertyWebkitTextCombine: 1031 case CSSPropertyWebkitTextCombine:
1032 case CSSPropertyWebkitTextEmphasisPosition: 1032 case CSSPropertyWebkitTextEmphasisPosition:
1033 case CSSPropertyWebkitTextSecurity: 1033 case CSSPropertyWebkitTextSecurity:
1034 case CSSPropertyWebkitTransformStyle: 1034 case CSSPropertyWebkitTransformStyle:
1035 case CSSPropertyWebkitUserDrag: 1035 case CSSPropertyWebkitUserDrag:
(...skipping 1778 matching lines...) Expand 10 before | Expand all | Expand 10 after
2814 case CSSPropertyWebkitMarginTopCollapse: 2814 case CSSPropertyWebkitMarginTopCollapse:
2815 case CSSPropertyWebkitMarqueeDirection: 2815 case CSSPropertyWebkitMarqueeDirection:
2816 case CSSPropertyWebkitMarqueeStyle: 2816 case CSSPropertyWebkitMarqueeStyle:
2817 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING) 2817 #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
2818 case CSSPropertyWebkitOverflowScrolling: 2818 case CSSPropertyWebkitOverflowScrolling:
2819 #endif 2819 #endif
2820 case CSSPropertyWebkitPrintColorAdjust: 2820 case CSSPropertyWebkitPrintColorAdjust:
2821 case CSSPropertyWebkitRegionBreakAfter: 2821 case CSSPropertyWebkitRegionBreakAfter:
2822 case CSSPropertyWebkitRegionBreakBefore: 2822 case CSSPropertyWebkitRegionBreakBefore:
2823 case CSSPropertyWebkitRegionBreakInside: 2823 case CSSPropertyWebkitRegionBreakInside:
2824 case CSSPropertyWebkitRegionOverflow: 2824 case CSSPropertyWebkitRegionFragment:
2825 case CSSPropertyWebkitRtlOrdering: 2825 case CSSPropertyWebkitRtlOrdering:
2826 case CSSPropertyWebkitRubyPosition: 2826 case CSSPropertyWebkitRubyPosition:
2827 #if ENABLE(CSS3_TEXT) 2827 #if ENABLE(CSS3_TEXT)
2828 case CSSPropertyWebkitTextAlignLast: 2828 case CSSPropertyWebkitTextAlignLast:
2829 #endif // CSS3_TEXT 2829 #endif // CSS3_TEXT
2830 case CSSPropertyWebkitTextCombine: 2830 case CSSPropertyWebkitTextCombine:
2831 case CSSPropertyWebkitTextEmphasisPosition: 2831 case CSSPropertyWebkitTextEmphasisPosition:
2832 case CSSPropertyWebkitTextSecurity: 2832 case CSSPropertyWebkitTextSecurity:
2833 case CSSPropertyWebkitTransformStyle: 2833 case CSSPropertyWebkitTransformStyle:
2834 case CSSPropertyWebkitUserDrag: 2834 case CSSPropertyWebkitUserDrag:
(...skipping 8969 matching lines...) Expand 10 before | Expand all | Expand 10 after
11804 { 11804 {
11805 // The tokenizer checks for the construct of an+b. 11805 // The tokenizer checks for the construct of an+b.
11806 // However, since the {ident} rule precedes the {nth} rule, some of those 11806 // However, since the {ident} rule precedes the {nth} rule, some of those
11807 // tokens are identified as string literal. Furthermore we need to accept 11807 // tokens are identified as string literal. Furthermore we need to accept
11808 // "odd" and "even" which does not match to an+b. 11808 // "odd" and "even" which does not match to an+b.
11809 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11809 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11810 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11810 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11811 } 11811 }
11812 11812
11813 } 11813 }
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