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

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

Issue 16357011: Remove support for -webkit-color-correction (which we've never supported on (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: resolve merge conflicts, obey brace style changes 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 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 return true; 760 return true;
761 break; 761 break;
762 case CSSPropertyWebkitBoxOrient: 762 case CSSPropertyWebkitBoxOrient:
763 if (valueID == CSSValueHorizontal || valueID == CSSValueVertical || valu eID == CSSValueInlineAxis || valueID == CSSValueBlockAxis) 763 if (valueID == CSSValueHorizontal || valueID == CSSValueVertical || valu eID == CSSValueInlineAxis || valueID == CSSValueBlockAxis)
764 return true; 764 return true;
765 break; 765 break;
766 case CSSPropertyWebkitBoxPack: 766 case CSSPropertyWebkitBoxPack:
767 if (valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSS ValueCenter || valueID == CSSValueJustify) 767 if (valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSS ValueCenter || valueID == CSSValueJustify)
768 return true; 768 return true;
769 break; 769 break;
770 case CSSPropertyWebkitColorCorrection:
771 if (valueID == CSSValueSrgb || valueID == CSSValueDefault)
772 return true;
773 break;
774 case CSSPropertyWebkitAlignContent: 770 case CSSPropertyWebkitAlignContent:
775 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || value ID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSp aceAround || valueID == CSSValueStretch) 771 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || value ID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSp aceAround || valueID == CSSValueStretch)
776 return true; 772 return true;
777 break; 773 break;
778 case CSSPropertyWebkitAlignItems: 774 case CSSPropertyWebkitAlignItems:
779 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueI D == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch ) 775 if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueI D == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch )
780 return true; 776 return true;
781 break; 777 break;
782 case CSSPropertyWebkitAlignSelf: 778 case CSSPropertyWebkitAlignSelf:
783 if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID = = CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch) 779 if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID = = CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch)
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 case CSSPropertyWebkitBorderBeforeStyle: 985 case CSSPropertyWebkitBorderBeforeStyle:
990 case CSSPropertyWebkitBorderEndStyle: 986 case CSSPropertyWebkitBorderEndStyle:
991 case CSSPropertyWebkitBorderFit: 987 case CSSPropertyWebkitBorderFit:
992 case CSSPropertyWebkitBorderStartStyle: 988 case CSSPropertyWebkitBorderStartStyle:
993 case CSSPropertyWebkitBoxAlign: 989 case CSSPropertyWebkitBoxAlign:
994 case CSSPropertyWebkitBoxDecorationBreak: 990 case CSSPropertyWebkitBoxDecorationBreak:
995 case CSSPropertyWebkitBoxDirection: 991 case CSSPropertyWebkitBoxDirection:
996 case CSSPropertyWebkitBoxLines: 992 case CSSPropertyWebkitBoxLines:
997 case CSSPropertyWebkitBoxOrient: 993 case CSSPropertyWebkitBoxOrient:
998 case CSSPropertyWebkitBoxPack: 994 case CSSPropertyWebkitBoxPack:
999 case CSSPropertyWebkitColorCorrection:
1000 case CSSPropertyWebkitColumnBreakAfter: 995 case CSSPropertyWebkitColumnBreakAfter:
1001 case CSSPropertyWebkitColumnBreakBefore: 996 case CSSPropertyWebkitColumnBreakBefore:
1002 case CSSPropertyWebkitColumnBreakInside: 997 case CSSPropertyWebkitColumnBreakInside:
1003 case CSSPropertyWebkitColumnRuleStyle: 998 case CSSPropertyWebkitColumnRuleStyle:
1004 case CSSPropertyWebkitAlignContent: 999 case CSSPropertyWebkitAlignContent:
1005 case CSSPropertyWebkitAlignItems: 1000 case CSSPropertyWebkitAlignItems:
1006 case CSSPropertyWebkitAlignSelf: 1001 case CSSPropertyWebkitAlignSelf:
1007 case CSSPropertyWebkitFlexDirection: 1002 case CSSPropertyWebkitFlexDirection:
1008 case CSSPropertyWebkitFlexWrap: 1003 case CSSPropertyWebkitFlexWrap:
1009 case CSSPropertyWebkitJustifyContent: 1004 case CSSPropertyWebkitJustifyContent:
(...skipping 1785 matching lines...) Expand 10 before | Expand all | Expand 10 after
2795 case CSSPropertyWebkitBorderBeforeStyle: 2790 case CSSPropertyWebkitBorderBeforeStyle:
2796 case CSSPropertyWebkitBorderEndStyle: 2791 case CSSPropertyWebkitBorderEndStyle:
2797 case CSSPropertyWebkitBorderFit: 2792 case CSSPropertyWebkitBorderFit:
2798 case CSSPropertyWebkitBorderStartStyle: 2793 case CSSPropertyWebkitBorderStartStyle:
2799 case CSSPropertyWebkitBoxAlign: 2794 case CSSPropertyWebkitBoxAlign:
2800 case CSSPropertyWebkitBoxDecorationBreak: 2795 case CSSPropertyWebkitBoxDecorationBreak:
2801 case CSSPropertyWebkitBoxDirection: 2796 case CSSPropertyWebkitBoxDirection:
2802 case CSSPropertyWebkitBoxLines: 2797 case CSSPropertyWebkitBoxLines:
2803 case CSSPropertyWebkitBoxOrient: 2798 case CSSPropertyWebkitBoxOrient:
2804 case CSSPropertyWebkitBoxPack: 2799 case CSSPropertyWebkitBoxPack:
2805 case CSSPropertyWebkitColorCorrection:
2806 case CSSPropertyWebkitColumnBreakAfter: 2800 case CSSPropertyWebkitColumnBreakAfter:
2807 case CSSPropertyWebkitColumnBreakBefore: 2801 case CSSPropertyWebkitColumnBreakBefore:
2808 case CSSPropertyWebkitColumnBreakInside: 2802 case CSSPropertyWebkitColumnBreakInside:
2809 case CSSPropertyWebkitColumnRuleStyle: 2803 case CSSPropertyWebkitColumnRuleStyle:
2810 case CSSPropertyWebkitAlignContent: 2804 case CSSPropertyWebkitAlignContent:
2811 case CSSPropertyWebkitAlignItems: 2805 case CSSPropertyWebkitAlignItems:
2812 case CSSPropertyWebkitAlignSelf: 2806 case CSSPropertyWebkitAlignSelf:
2813 case CSSPropertyWebkitFlexDirection: 2807 case CSSPropertyWebkitFlexDirection:
2814 case CSSPropertyWebkitFlexWrap: 2808 case CSSPropertyWebkitFlexWrap:
2815 case CSSPropertyWebkitJustifyContent: 2809 case CSSPropertyWebkitJustifyContent:
(...skipping 8950 matching lines...) Expand 10 before | Expand all | Expand 10 after
11766 { 11760 {
11767 // The tokenizer checks for the construct of an+b. 11761 // The tokenizer checks for the construct of an+b.
11768 // However, since the {ident} rule precedes the {nth} rule, some of those 11762 // However, since the {ident} rule precedes the {nth} rule, some of those
11769 // tokens are identified as string literal. Furthermore we need to accept 11763 // tokens are identified as string literal. Furthermore we need to accept
11770 // "odd" and "even" which does not match to an+b. 11764 // "odd" and "even" which does not match to an+b.
11771 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11765 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11772 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11766 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11773 } 11767 }
11774 11768
11775 } 11769 }
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