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

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

Issue 20526006: Remove -webkit-hyphens and -webkit-hyphenate-limit-* properties. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: init removal Created 7 years, 4 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 | Annotate | Revision Log
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 784 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 return true; 795 return true;
796 break; 796 break;
797 case CSSPropertyWebkitFontKerning: 797 case CSSPropertyWebkitFontKerning:
798 if (valueID == CSSValueAuto || valueID == CSSValueNormal || valueID == C SSValueNone) 798 if (valueID == CSSValueAuto || valueID == CSSValueNormal || valueID == C SSValueNone)
799 return true; 799 return true;
800 break; 800 break;
801 case CSSPropertyWebkitFontSmoothing: 801 case CSSPropertyWebkitFontSmoothing:
802 if (valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSS ValueAntialiased || valueID == CSSValueSubpixelAntialiased) 802 if (valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSS ValueAntialiased || valueID == CSSValueSubpixelAntialiased)
803 return true; 803 return true;
804 break; 804 break;
805 case CSSPropertyWebkitHyphens:
806 if (valueID == CSSValueNone || valueID == CSSValueManual || valueID == C SSValueAuto)
807 return true;
808 break;
809 case CSSPropertyGridAutoFlow: 805 case CSSPropertyGridAutoFlow:
810 if (valueID == CSSValueNone || valueID == CSSValueRow || valueID == CSSV alueColumn) 806 if (valueID == CSSValueNone || valueID == CSSValueRow || valueID == CSSV alueColumn)
811 return RuntimeEnabledFeatures::cssGridLayoutEnabled(); 807 return RuntimeEnabledFeatures::cssGridLayoutEnabled();
812 break; 808 break;
813 case CSSPropertyWebkitLineAlign: 809 case CSSPropertyWebkitLineAlign:
814 if (valueID == CSSValueNone || valueID == CSSValueEdges) 810 if (valueID == CSSValueNone || valueID == CSSValueEdges)
815 return true; 811 return true;
816 break; 812 break;
817 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space 813 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space
818 if (valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CS SValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpace) 814 if (valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CS SValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpace)
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
989 case CSSPropertyWebkitColumnBreakInside: 985 case CSSPropertyWebkitColumnBreakInside:
990 case CSSPropertyWebkitColumnRuleStyle: 986 case CSSPropertyWebkitColumnRuleStyle:
991 case CSSPropertyAlignContent: 987 case CSSPropertyAlignContent:
992 case CSSPropertyAlignItems: 988 case CSSPropertyAlignItems:
993 case CSSPropertyAlignSelf: 989 case CSSPropertyAlignSelf:
994 case CSSPropertyFlexDirection: 990 case CSSPropertyFlexDirection:
995 case CSSPropertyFlexWrap: 991 case CSSPropertyFlexWrap:
996 case CSSPropertyJustifyContent: 992 case CSSPropertyJustifyContent:
997 case CSSPropertyWebkitFontKerning: 993 case CSSPropertyWebkitFontKerning:
998 case CSSPropertyWebkitFontSmoothing: 994 case CSSPropertyWebkitFontSmoothing:
999 case CSSPropertyWebkitHyphens:
1000 case CSSPropertyGridAutoFlow: 995 case CSSPropertyGridAutoFlow:
1001 case CSSPropertyWebkitLineAlign: 996 case CSSPropertyWebkitLineAlign:
1002 case CSSPropertyWebkitLineBreak: 997 case CSSPropertyWebkitLineBreak:
1003 case CSSPropertyWebkitLineSnap: 998 case CSSPropertyWebkitLineSnap:
1004 case CSSPropertyWebkitMarginAfterCollapse: 999 case CSSPropertyWebkitMarginAfterCollapse:
1005 case CSSPropertyWebkitMarginBeforeCollapse: 1000 case CSSPropertyWebkitMarginBeforeCollapse:
1006 case CSSPropertyWebkitMarginBottomCollapse: 1001 case CSSPropertyWebkitMarginBottomCollapse:
1007 case CSSPropertyWebkitMarginTopCollapse: 1002 case CSSPropertyWebkitMarginTopCollapse:
1008 case CSSPropertyWebkitMarqueeDirection: 1003 case CSSPropertyWebkitMarqueeDirection:
1009 case CSSPropertyWebkitMarqueeStyle: 1004 case CSSPropertyWebkitMarqueeStyle:
(...skipping 1526 matching lines...) Expand 10 before | Expand all | Expand 10 after
2536 case CSSPropertyWebkitHighlight: 2531 case CSSPropertyWebkitHighlight:
2537 if (id == CSSValueNone || value->unit == CSSPrimitiveValue::CSS_STRING) 2532 if (id == CSSValueNone || value->unit == CSSPrimitiveValue::CSS_STRING)
2538 validPrimitive = true; 2533 validPrimitive = true;
2539 break; 2534 break;
2540 2535
2541 case CSSPropertyWebkitHyphenateCharacter: 2536 case CSSPropertyWebkitHyphenateCharacter:
2542 if (id == CSSValueAuto || value->unit == CSSPrimitiveValue::CSS_STRING) 2537 if (id == CSSValueAuto || value->unit == CSSPrimitiveValue::CSS_STRING)
2543 validPrimitive = true; 2538 validPrimitive = true;
2544 break; 2539 break;
2545 2540
2546 case CSSPropertyWebkitHyphenateLimitBefore:
2547 case CSSPropertyWebkitHyphenateLimitAfter:
2548 if (id == CSSValueAuto || validUnit(value, FInteger | FNonNeg, CSSStrict Mode))
2549 validPrimitive = true;
2550 break;
2551
2552 case CSSPropertyWebkitHyphenateLimitLines:
2553 if (id == CSSValueNoLimit || validUnit(value, FInteger | FNonNeg, CSSStr ictMode))
2554 validPrimitive = true;
2555 break;
2556
2557 case CSSPropertyWebkitLineGrid: 2541 case CSSPropertyWebkitLineGrid:
2558 if (id == CSSValueNone) 2542 if (id == CSSValueNone)
2559 validPrimitive = true; 2543 validPrimitive = true;
2560 else if (value->unit == CSSPrimitiveValue::CSS_IDENT) { 2544 else if (value->unit == CSSPrimitiveValue::CSS_IDENT) {
2561 String lineGridValue = String(value->string); 2545 String lineGridValue = String(value->string);
2562 if (!lineGridValue.isEmpty()) { 2546 if (!lineGridValue.isEmpty()) {
2563 addProperty(propId, cssValuePool().createValue(lineGridValue, CS SPrimitiveValue::CSS_STRING), important); 2547 addProperty(propId, cssValuePool().createValue(lineGridValue, CS SPrimitiveValue::CSS_STRING), important);
2564 return true; 2548 return true;
2565 } 2549 }
2566 } 2550 }
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
2801 case CSSPropertyWebkitColumnBreakInside: 2785 case CSSPropertyWebkitColumnBreakInside:
2802 case CSSPropertyWebkitColumnRuleStyle: 2786 case CSSPropertyWebkitColumnRuleStyle:
2803 case CSSPropertyAlignContent: 2787 case CSSPropertyAlignContent:
2804 case CSSPropertyAlignItems: 2788 case CSSPropertyAlignItems:
2805 case CSSPropertyAlignSelf: 2789 case CSSPropertyAlignSelf:
2806 case CSSPropertyFlexDirection: 2790 case CSSPropertyFlexDirection:
2807 case CSSPropertyFlexWrap: 2791 case CSSPropertyFlexWrap:
2808 case CSSPropertyJustifyContent: 2792 case CSSPropertyJustifyContent:
2809 case CSSPropertyWebkitFontKerning: 2793 case CSSPropertyWebkitFontKerning:
2810 case CSSPropertyWebkitFontSmoothing: 2794 case CSSPropertyWebkitFontSmoothing:
2811 case CSSPropertyWebkitHyphens:
2812 case CSSPropertyGridAutoFlow: 2795 case CSSPropertyGridAutoFlow:
2813 case CSSPropertyWebkitLineAlign: 2796 case CSSPropertyWebkitLineAlign:
2814 case CSSPropertyWebkitLineBreak: 2797 case CSSPropertyWebkitLineBreak:
2815 case CSSPropertyWebkitLineSnap: 2798 case CSSPropertyWebkitLineSnap:
2816 case CSSPropertyWebkitMarginAfterCollapse: 2799 case CSSPropertyWebkitMarginAfterCollapse:
2817 case CSSPropertyWebkitMarginBeforeCollapse: 2800 case CSSPropertyWebkitMarginBeforeCollapse:
2818 case CSSPropertyWebkitMarginBottomCollapse: 2801 case CSSPropertyWebkitMarginBottomCollapse:
2819 case CSSPropertyWebkitMarginTopCollapse: 2802 case CSSPropertyWebkitMarginTopCollapse:
2820 case CSSPropertyWebkitMarqueeDirection: 2803 case CSSPropertyWebkitMarqueeDirection:
2821 case CSSPropertyWebkitMarqueeStyle: 2804 case CSSPropertyWebkitMarqueeStyle:
(...skipping 8848 matching lines...) Expand 10 before | Expand all | Expand 10 after
11670 { 11653 {
11671 // The tokenizer checks for the construct of an+b. 11654 // The tokenizer checks for the construct of an+b.
11672 // However, since the {ident} rule precedes the {nth} rule, some of those 11655 // However, since the {ident} rule precedes the {nth} rule, some of those
11673 // tokens are identified as string literal. Furthermore we need to accept 11656 // tokens are identified as string literal. Furthermore we need to accept
11674 // "odd" and "even" which does not match to an+b. 11657 // "odd" and "even" which does not match to an+b.
11675 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11658 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11676 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11659 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11677 } 11660 }
11678 11661
11679 } 11662 }
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