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

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

Issue 636993002: [CSS Grid Layout] Upgrade justify-content parsing to CSS3 Box Alignment spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebaseline some tests expectations. Created 6 years, 1 month 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 | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | 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 "config.h" 5 #include "config.h"
6 #include "core/css/parser/CSSParserFastPaths.h" 6 #include "core/css/parser/CSSParserFastPaths.h"
7 7
8 #include "core/StylePropertyShorthand.h" 8 #include "core/StylePropertyShorthand.h"
9 #include "core/css/CSSTransformValue.h" 9 #include "core/css/CSSTransformValue.h"
10 #include "core/css/CSSValuePool.h" 10 #include "core/css/CSSValuePool.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 case CSSPropertyAlignItems: 311 case CSSPropertyAlignItems:
312 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code. 312 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code.
313 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStre tch; 313 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStre tch;
314 case CSSPropertyAlignSelf: 314 case CSSPropertyAlignSelf:
315 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code. 315 // FIXME: Per CSS alignment, this property should accept the same argume nts as 'justify-self' so we should share its parsing code.
316 return valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueI D == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch; 316 return valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueI D == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch;
317 case CSSPropertyFlexDirection: 317 case CSSPropertyFlexDirection:
318 return valueID == CSSValueRow || valueID == CSSValueRowReverse || valueI D == CSSValueColumn || valueID == CSSValueColumnReverse; 318 return valueID == CSSValueRow || valueID == CSSValueRowReverse || valueI D == CSSValueColumn || valueID == CSSValueColumnReverse;
319 case CSSPropertyFlexWrap: 319 case CSSPropertyFlexWrap:
320 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID = = CSSValueWrapReverse; 320 return valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID = = CSSValueWrapReverse;
321 case CSSPropertyJustifyContent:
322 // FIXME: Per CSS alignment, this property should accept an optional <ov erflow-position>. We should share this parsing code with 'justify-self'.
323 return valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || val ueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValue SpaceAround;
324 case CSSPropertyFontKerning: 321 case CSSPropertyFontKerning:
325 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID = = CSSValueNone; 322 return valueID == CSSValueAuto || valueID == CSSValueNormal || valueID = = CSSValueNone;
326 case CSSPropertyWebkitFontSmoothing: 323 case CSSPropertyWebkitFontSmoothing:
327 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased; 324 return valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueAntialiased || valueID == CSSValueSubpixelAntialiased;
328 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space 325 case CSSPropertyWebkitLineBreak: // auto | loose | normal | strict | after-w hite-space
329 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce; 326 return valueID == CSSValueAuto || valueID == CSSValueLoose || valueID == CSSValueNormal || valueID == CSSValueStrict || valueID == CSSValueAfterWhiteSpa ce;
330 case CSSPropertyWebkitMarginAfterCollapse: 327 case CSSPropertyWebkitMarginAfterCollapse:
331 case CSSPropertyWebkitMarginBeforeCollapse: 328 case CSSPropertyWebkitMarginBeforeCollapse:
332 case CSSPropertyWebkitMarginBottomCollapse: 329 case CSSPropertyWebkitMarginBottomCollapse:
333 case CSSPropertyWebkitMarginTopCollapse: 330 case CSSPropertyWebkitMarginTopCollapse:
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 case CSSPropertyWebkitBoxOrient: 429 case CSSPropertyWebkitBoxOrient:
433 case CSSPropertyWebkitBoxPack: 430 case CSSPropertyWebkitBoxPack:
434 case CSSPropertyWebkitColumnBreakAfter: 431 case CSSPropertyWebkitColumnBreakAfter:
435 case CSSPropertyWebkitColumnBreakBefore: 432 case CSSPropertyWebkitColumnBreakBefore:
436 case CSSPropertyWebkitColumnBreakInside: 433 case CSSPropertyWebkitColumnBreakInside:
437 case CSSPropertyColumnFill: 434 case CSSPropertyColumnFill:
438 case CSSPropertyWebkitColumnRuleStyle: 435 case CSSPropertyWebkitColumnRuleStyle:
439 case CSSPropertyAlignContent: 436 case CSSPropertyAlignContent:
440 case CSSPropertyFlexDirection: 437 case CSSPropertyFlexDirection:
441 case CSSPropertyFlexWrap: 438 case CSSPropertyFlexWrap:
442 case CSSPropertyJustifyContent:
443 case CSSPropertyFontKerning: 439 case CSSPropertyFontKerning:
444 case CSSPropertyWebkitFontSmoothing: 440 case CSSPropertyWebkitFontSmoothing:
445 case CSSPropertyWebkitLineBreak: 441 case CSSPropertyWebkitLineBreak:
446 case CSSPropertyWebkitMarginAfterCollapse: 442 case CSSPropertyWebkitMarginAfterCollapse:
447 case CSSPropertyWebkitMarginBeforeCollapse: 443 case CSSPropertyWebkitMarginBeforeCollapse:
448 case CSSPropertyWebkitMarginBottomCollapse: 444 case CSSPropertyWebkitMarginBottomCollapse:
449 case CSSPropertyWebkitMarginTopCollapse: 445 case CSSPropertyWebkitMarginTopCollapse:
450 case CSSPropertyInternalMarqueeDirection: 446 case CSSPropertyInternalMarqueeDirection:
451 case CSSPropertyInternalMarqueeStyle: 447 case CSSPropertyInternalMarqueeStyle:
452 case CSSPropertyWebkitPrintColorAdjust: 448 case CSSPropertyWebkitPrintColorAdjust:
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 if (RefPtrWillBeRawPtr<CSSValue> color = parseColorValue(propertyID, string, parserMode)) 669 if (RefPtrWillBeRawPtr<CSSValue> color = parseColorValue(propertyID, string, parserMode))
674 return color.release(); 670 return color.release();
675 if (RefPtrWillBeRawPtr<CSSValue> keyword = parseKeywordValue(propertyID, str ing)) 671 if (RefPtrWillBeRawPtr<CSSValue> keyword = parseKeywordValue(propertyID, str ing))
676 return keyword.release(); 672 return keyword.release();
677 if (RefPtrWillBeRawPtr<CSSValue> transform = parseSimpleTransform(propertyID , string)) 673 if (RefPtrWillBeRawPtr<CSSValue> transform = parseSimpleTransform(propertyID , string))
678 return transform.release(); 674 return transform.release();
679 return nullptr; 675 return nullptr;
680 } 676 }
681 677
682 } // namespace blink 678 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSValueKeywords.in ('k') | Source/core/css/parser/CSSPropertyParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698