| 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 CSSPropertyID) { |
| 17 DCHECK(RuntimeEnabledFeatures::cssGridLayoutEnabled()); | 18 DCHECK(RuntimeEnabledFeatures::cssGridLayoutEnabled()); |
| 18 CSSParserTokenRange range_copy = range; | 19 CSSParserTokenRange range_copy = range; |
| 19 CSSIdentifierValue* legacy = | 20 CSSIdentifierValue* legacy = |
| 20 CSSPropertyParserHelpers::ConsumeIdent<CSSValueLegacy>(range_copy); | 21 CSSPropertyParserHelpers::ConsumeIdent<CSSValueLegacy>(range_copy); |
| 21 CSSIdentifierValue* position_keyword = | 22 CSSIdentifierValue* position_keyword = |
| 22 CSSPropertyParserHelpers::ConsumeIdent<CSSValueCenter, CSSValueLeft, | 23 CSSPropertyParserHelpers::ConsumeIdent<CSSValueCenter, CSSValueLeft, |
| 23 CSSValueRight>(range_copy); | 24 CSSValueRight>(range_copy); |
| 24 if (!legacy) | 25 if (!legacy) |
| 25 legacy = CSSPropertyParserHelpers::ConsumeIdent<CSSValueLegacy>(range_copy); | 26 legacy = CSSPropertyParserHelpers::ConsumeIdent<CSSValueLegacy>(range_copy); |
| 26 if (legacy && position_keyword) { | 27 if (legacy && position_keyword) { |
| 27 range = range_copy; | 28 range = range_copy; |
| 28 return CSSValuePair::Create(legacy, position_keyword, | 29 return CSSValuePair::Create(legacy, position_keyword, |
| 29 CSSValuePair::kDropIdenticalValues); | 30 CSSValuePair::kDropIdenticalValues); |
| 30 } | 31 } |
| 31 return CSSPropertyAlignmentUtils::ConsumeSelfPositionOverflowPosition(range); | 32 return CSSPropertyAlignmentUtils::ConsumeSelfPositionOverflowPosition(range); |
| 32 } | 33 } |
| 33 | 34 |
| 34 } // namespace blink | 35 } // namespace blink |
| OLD | NEW |