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

Side by Side Diff: third_party/WebKit/Source/core/css/parser/CSSParserFastPaths.cpp

Issue 2342433002: Make 'auto' invalid for the 'hyphens' property when no dictionaries (Closed)
Patch Set: TestExpectations Created 4 years, 3 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
« no previous file with comments | « third_party/WebKit/LayoutTests/platform/win/fast/text/hyphens/hyphens-parsing-001-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/css/parser/CSSParserFastPaths.h" 5 #include "core/css/parser/CSSParserFastPaths.h"
6 6
7 #include "core/StylePropertyShorthand.h" 7 #include "core/StylePropertyShorthand.h"
8 #include "core/css/CSSColorValue.h" 8 #include "core/css/CSSColorValue.h"
9 #include "core/css/CSSFunctionValue.h" 9 #include "core/css/CSSFunctionValue.h"
10 #include "core/css/CSSInheritedValue.h" 10 #include "core/css/CSSInheritedValue.h"
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code. 656 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code.
657 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStre tch; 657 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStre tch;
658 case CSSPropertyAlignSelf: 658 case CSSPropertyAlignSelf:
659 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code. 659 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code.
660 return valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueI D == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch; 660 return valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueI D == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch;
661 case CSSPropertyFlexDirection: 661 case CSSPropertyFlexDirection:
662 return valueID == CSSValueRow || valueID == CSSValueRowReverse || valueI D == CSSValueColumn || valueID == CSSValueColumnReverse; 662 return valueID == CSSValueRow || valueID == CSSValueRowReverse || valueI D == CSSValueColumn || valueID == CSSValueColumnReverse;
663 case CSSPropertyFlexWrap: 663 case CSSPropertyFlexWrap:
664 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID = = CSSValueWrapReverse; 664 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID = = CSSValueWrapReverse;
665 case CSSPropertyHyphens: 665 case CSSPropertyHyphens:
666 #if OS(ANDROID) || OS(MACOSX)
666 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueManual; 667 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueManual;
668 #else
669 return valueID == CSSValueNone || valueID == CSSValueManual;
670 #endif
667 case CSSPropertyJustifyContent: 671 case CSSPropertyJustifyContent:
668 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'. 672 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'.
669 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround; 673 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround;
670 case CSSPropertyFontKerning: 674 case CSSPropertyFontKerning:
671 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID = = CSSValueNone; 675 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID = = CSSValueNone;
672 case CSSPropertyWebkitFontSmoothing: 676 case CSSPropertyWebkitFontSmoothing:
673 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased; 677 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased;
674 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space 678 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space
675 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce; 679 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce;
676 case CSSPropertyWebkitMarginAfterCollapse: 680 case CSSPropertyWebkitMarginAfterCollapse:
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
1081 if (isColorPropertyID(propertyID)) 1085 if (isColorPropertyID(propertyID))
1082 return parseColor(string, parserMode); 1086 return parseColor(string, parserMode);
1083 if (CSSValue* keyword = parseKeywordValue(propertyID, string, parserMode)) 1087 if (CSSValue* keyword = parseKeywordValue(propertyID, string, parserMode))
1084 return keyword; 1088 return keyword;
1085 if (CSSValue* transform = parseSimpleTransform(propertyID, string)) 1089 if (CSSValue* transform = parseSimpleTransform(propertyID, string))
1086 return transform; 1090 return transform;
1087 return nullptr; 1091 return nullptr;
1088 } 1092 }
1089 1093
1090 } // namespace blink 1094 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/platform/win/fast/text/hyphens/hyphens-parsing-001-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698