| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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/properties/CSSPropertyAPIJustifyItems.h" | 5 #include "core/css/properties/CSSPropertyAPIJustifyItems.h" |
| 6 | 6 |
| 7 #include "core/css/CSSValuePair.h" | 7 #include "core/css/CSSValuePair.h" |
| 8 #include "core/css/parser/CSSPropertyParserHelpers.h" | 8 #include "core/css/parser/CSSPropertyParserHelpers.h" |
| 9 #include "core/css/properties/CSSPropertyAlignmentUtils.h" | 9 #include "core/css/properties/CSSPropertyAlignmentUtils.h" |
| 10 #include "platform/RuntimeEnabledFeatures.h" | 10 #include "platform/RuntimeEnabledFeatures.h" |
| 11 | 11 |
| 12 namespace blink { | 12 namespace blink { |
| 13 | 13 |
| 14 const CSSValue* CSSPropertyAPIJustifyItems::parseSingleValue( | 14 const CSSValue* CSSPropertyAPIJustifyItems::parseSingleValue( |
| 15 CSSParserTokenRange& range, | 15 CSSParserTokenRange& range, |
| 16 const CSSParserContext* context) { | 16 const CSSParserContext& context) { |
| 17 DCHECK(RuntimeEnabledFeatures::cssGridLayoutEnabled()); | 17 DCHECK(RuntimeEnabledFeatures::cssGridLayoutEnabled()); |
| 18 CSSParserTokenRange rangeCopy = range; | 18 CSSParserTokenRange rangeCopy = range; |
| 19 CSSIdentifierValue* legacy = | 19 CSSIdentifierValue* legacy = |
| 20 CSSPropertyParserHelpers::consumeIdent<CSSValueLegacy>(rangeCopy); | 20 CSSPropertyParserHelpers::consumeIdent<CSSValueLegacy>(rangeCopy); |
| 21 CSSIdentifierValue* positionKeyword = | 21 CSSIdentifierValue* positionKeyword = |
| 22 CSSPropertyParserHelpers::consumeIdent<CSSValueCenter, CSSValueLeft, | 22 CSSPropertyParserHelpers::consumeIdent<CSSValueCenter, CSSValueLeft, |
| 23 CSSValueRight>(rangeCopy); | 23 CSSValueRight>(rangeCopy); |
| 24 if (!legacy) | 24 if (!legacy) |
| 25 legacy = CSSPropertyParserHelpers::consumeIdent<CSSValueLegacy>(rangeCopy); | 25 legacy = CSSPropertyParserHelpers::consumeIdent<CSSValueLegacy>(rangeCopy); |
| 26 if (legacy && positionKeyword) { | 26 if (legacy && positionKeyword) { |
| 27 range = rangeCopy; | 27 range = rangeCopy; |
| 28 return CSSValuePair::create(legacy, positionKeyword, | 28 return CSSValuePair::create(legacy, positionKeyword, |
| 29 CSSValuePair::DropIdenticalValues); | 29 CSSValuePair::DropIdenticalValues); |
| 30 } | 30 } |
| 31 return CSSPropertyAlignmentUtils::consumeSelfPositionOverflowPosition(range); | 31 return CSSPropertyAlignmentUtils::consumeSelfPositionOverflowPosition(range); |
| 32 } | 32 } |
| 33 | 33 |
| 34 } // namespace blink | 34 } // namespace blink |
| OLD | NEW |