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

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

Issue 17155007: [CSS3] Parsing the property, text-justify. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@parsingTextJustify
Patch Set: Created 7 years, 5 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 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 case CSSPropertyTableLayout: // auto | fixed | inherit 687 case CSSPropertyTableLayout: // auto | fixed | inherit
688 if (valueID == CSSValueAuto || valueID == CSSValueFixed) 688 if (valueID == CSSValueAuto || valueID == CSSValueFixed)
689 return true; 689 return true;
690 break; 690 break;
691 case CSSPropertyTextAlignLast: 691 case CSSPropertyTextAlignLast:
692 // auto | start | end | left | right | center | justify 692 // auto | start | end | left | right | center | justify
693 if (RuntimeEnabledFeatures::css3TextEnabled() 693 if (RuntimeEnabledFeatures::css3TextEnabled()
694 && ((valueID >= CSSValueLeft && valueID <= CSSValueJustify) || value ID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueAuto)) 694 && ((valueID >= CSSValueLeft && valueID <= CSSValueJustify) || value ID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueAuto))
695 return true; 695 return true;
696 break; 696 break;
697 case CSSPropertyTextJustify:
698 // auto | none | inter-word | distribute
699 if (RuntimeEnabledFeatures::css3TextEnabled()
700 && (valueID == CSSValueInterWord || valueID == CSSValueDistribute || valueID == CSSValueAuto || valueID == CSSValueNone))
701 return true;
702 break;
697 case CSSPropertyTextLineThroughMode: 703 case CSSPropertyTextLineThroughMode:
698 case CSSPropertyTextOverlineMode: 704 case CSSPropertyTextOverlineMode:
699 case CSSPropertyTextUnderlineMode: 705 case CSSPropertyTextUnderlineMode:
700 if (valueID == CSSValueContinuous || valueID == CSSValueSkipWhiteSpace) 706 if (valueID == CSSValueContinuous || valueID == CSSValueSkipWhiteSpace)
701 return true; 707 return true;
702 break; 708 break;
703 case CSSPropertyTextLineThroughStyle: 709 case CSSPropertyTextLineThroughStyle:
704 case CSSPropertyTextOverlineStyle: 710 case CSSPropertyTextOverlineStyle:
705 case CSSPropertyTextUnderlineStyle: 711 case CSSPropertyTextUnderlineStyle:
706 if (valueID == CSSValueNone || valueID == CSSValueSolid || valueID == CS SValueDouble || valueID == CSSValueDashed || valueID == CSSValueDotDash || value ID == CSSValueDotDotDash || valueID == CSSValueWave) 712 if (valueID == CSSValueNone || valueID == CSSValueSolid || valueID == CS SValueDouble || valueID == CSSValueDashed || valueID == CSSValueDotDash || value ID == CSSValueDotDotDash || valueID == CSSValueWave)
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
953 case CSSPropertyOverflowX: 959 case CSSPropertyOverflowX:
954 case CSSPropertyOverflowY: 960 case CSSPropertyOverflowY:
955 case CSSPropertyPageBreakAfter: 961 case CSSPropertyPageBreakAfter:
956 case CSSPropertyPageBreakBefore: 962 case CSSPropertyPageBreakBefore:
957 case CSSPropertyPageBreakInside: 963 case CSSPropertyPageBreakInside:
958 case CSSPropertyPointerEvents: 964 case CSSPropertyPointerEvents:
959 case CSSPropertyPosition: 965 case CSSPropertyPosition:
960 case CSSPropertyResize: 966 case CSSPropertyResize:
961 case CSSPropertySpeak: 967 case CSSPropertySpeak:
962 case CSSPropertyTableLayout: 968 case CSSPropertyTableLayout:
969 case CSSPropertyTextJustify:
Julien - ping for review 2013/07/17 01:51:10 I would change CSSPropertyTextAlignLast above as p
dw.im 2013/07/17 02:03:15 I can do that. I've planned to fix that as part of
963 case CSSPropertyTextLineThroughMode: 970 case CSSPropertyTextLineThroughMode:
964 case CSSPropertyTextLineThroughStyle: 971 case CSSPropertyTextLineThroughStyle:
965 case CSSPropertyTextOverflow: 972 case CSSPropertyTextOverflow:
966 case CSSPropertyTextOverlineMode: 973 case CSSPropertyTextOverlineMode:
967 case CSSPropertyTextOverlineStyle: 974 case CSSPropertyTextOverlineStyle:
968 case CSSPropertyTextRendering: 975 case CSSPropertyTextRendering:
969 case CSSPropertyTextTransform: 976 case CSSPropertyTextTransform:
970 case CSSPropertyTextUnderlineMode: 977 case CSSPropertyTextUnderlineMode:
971 case CSSPropertyTextUnderlineStyle: 978 case CSSPropertyTextUnderlineStyle:
972 case CSSPropertyTouchAction: 979 case CSSPropertyTouchAction:
(...skipping 1787 matching lines...) Expand 10 before | Expand all | Expand 10 after
2760 case CSSPropertyOverflowY: 2767 case CSSPropertyOverflowY:
2761 case CSSPropertyPageBreakAfter: 2768 case CSSPropertyPageBreakAfter:
2762 case CSSPropertyPageBreakBefore: 2769 case CSSPropertyPageBreakBefore:
2763 case CSSPropertyPageBreakInside: 2770 case CSSPropertyPageBreakInside:
2764 case CSSPropertyPointerEvents: 2771 case CSSPropertyPointerEvents:
2765 case CSSPropertyPosition: 2772 case CSSPropertyPosition:
2766 case CSSPropertyResize: 2773 case CSSPropertyResize:
2767 case CSSPropertySpeak: 2774 case CSSPropertySpeak:
2768 case CSSPropertyTableLayout: 2775 case CSSPropertyTableLayout:
2769 case CSSPropertyTextAlignLast: 2776 case CSSPropertyTextAlignLast:
2777 case CSSPropertyTextJustify:
2770 case CSSPropertyTextLineThroughMode: 2778 case CSSPropertyTextLineThroughMode:
2771 case CSSPropertyTextLineThroughStyle: 2779 case CSSPropertyTextLineThroughStyle:
2772 case CSSPropertyTextOverflow: 2780 case CSSPropertyTextOverflow:
2773 case CSSPropertyTextOverlineMode: 2781 case CSSPropertyTextOverlineMode:
2774 case CSSPropertyTextOverlineStyle: 2782 case CSSPropertyTextOverlineStyle:
2775 case CSSPropertyTextRendering: 2783 case CSSPropertyTextRendering:
2776 case CSSPropertyTextTransform: 2784 case CSSPropertyTextTransform:
2777 case CSSPropertyTextUnderlineMode: 2785 case CSSPropertyTextUnderlineMode:
2778 case CSSPropertyTextUnderlineStyle: 2786 case CSSPropertyTextUnderlineStyle:
2779 case CSSPropertyTouchAction: 2787 case CSSPropertyTouchAction:
(...skipping 8963 matching lines...) Expand 10 before | Expand all | Expand 10 after
11743 { 11751 {
11744 // The tokenizer checks for the construct of an+b. 11752 // The tokenizer checks for the construct of an+b.
11745 // However, since the {ident} rule precedes the {nth} rule, some of those 11753 // However, since the {ident} rule precedes the {nth} rule, some of those
11746 // tokens are identified as string literal. Furthermore we need to accept 11754 // tokens are identified as string literal. Furthermore we need to accept
11747 // "odd" and "even" which does not match to an+b. 11755 // "odd" and "even" which does not match to an+b.
11748 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even") 11756 return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
11749 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n"); 11757 || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
11750 } 11758 }
11751 11759
11752 } 11760 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698