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

Side by Side Diff: third_party/WebKit/Source/core/css/properties/CSSShorthandPropertyAPIFlex.cpp

Issue 2938983002: Implement parseShorthand API for shorthand properties, "overflow", "font" and "font-variant" (Closed)
Patch Set: Replace ImplicitProperty by IsImplicitProperty Created 3 years, 6 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 // 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/CSSShorthandPropertyAPIFlex.h" 5 #include "core/css/properties/CSSShorthandPropertyAPIFlex.h"
6 6
7 #include "core/css/CSSIdentifierValue.h" 7 #include "core/css/CSSIdentifierValue.h"
8 #include "core/css/parser/CSSParserContext.h" 8 #include "core/css/parser/CSSParserContext.h"
9 #include "core/css/parser/CSSParserLocalContext.h" 9 #include "core/css/parser/CSSParserLocalContext.h"
10 #include "core/css/parser/CSSPropertyParserHelpers.h" 10 #include "core/css/parser/CSSPropertyParserHelpers.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 0, CSSPrimitiveValue::UnitType::kPercentage); 69 0, CSSPrimitiveValue::UnitType::kPercentage);
70 } 70 }
71 } 71 }
72 72
73 if (!range.AtEnd()) 73 if (!range.AtEnd())
74 return false; 74 return false;
75 CSSPropertyParserHelpers::AddProperty( 75 CSSPropertyParserHelpers::AddProperty(
76 CSSPropertyFlexGrow, CSSPropertyFlex, 76 CSSPropertyFlexGrow, CSSPropertyFlex,
77 *CSSPrimitiveValue::Create(clampTo<float>(flex_grow), 77 *CSSPrimitiveValue::Create(clampTo<float>(flex_grow),
78 CSSPrimitiveValue::UnitType::kNumber), 78 CSSPrimitiveValue::UnitType::kNumber),
79 important, false /* implicit */, properties); 79 important, CSSPropertyParserHelpers::IsImplicitProperty::kNotImplicit,
80 properties);
80 CSSPropertyParserHelpers::AddProperty( 81 CSSPropertyParserHelpers::AddProperty(
81 CSSPropertyFlexShrink, CSSPropertyFlex, 82 CSSPropertyFlexShrink, CSSPropertyFlex,
82 *CSSPrimitiveValue::Create(clampTo<float>(flex_shrink), 83 *CSSPrimitiveValue::Create(clampTo<float>(flex_shrink),
83 CSSPrimitiveValue::UnitType::kNumber), 84 CSSPrimitiveValue::UnitType::kNumber),
84 important, false /* implicit */, properties); 85 important, CSSPropertyParserHelpers::IsImplicitProperty::kNotImplicit,
86 properties);
85 87
86 CSSPropertyParserHelpers::AddProperty(CSSPropertyFlexBasis, CSSPropertyFlex, 88 CSSPropertyParserHelpers::AddProperty(
87 *flex_basis, important, 89 CSSPropertyFlexBasis, CSSPropertyFlex, *flex_basis, important,
88 false /* implicit */, properties); 90 CSSPropertyParserHelpers::IsImplicitProperty::kNotImplicit, properties);
89 91
90 return true; 92 return true;
91 } 93 }
92 94
93 } // namespace blink 95 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698