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

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

Issue 2808383008: Added unresolved property argument to ParseSingleValue method (Closed)
Patch Set: Created 3 years, 8 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/CSSPropertyAPIScale.h" 5 #include "core/css/properties/CSSPropertyAPIScale.h"
6 6
7 #include "core/css/CSSValueList.h" 7 #include "core/css/CSSValueList.h"
8 #include "core/css/parser/CSSPropertyParserHelpers.h" 8 #include "core/css/parser/CSSPropertyParserHelpers.h"
9 #include "platform/RuntimeEnabledFeatures.h" 9 #include "platform/RuntimeEnabledFeatures.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 const CSSValue* CSSPropertyAPIScale::parseSingleValue( 13 const CSSValue* CSSPropertyAPIScale::parseSingleValue(
14 CSSParserTokenRange& range, 14 CSSParserTokenRange& range,
15 const CSSParserContext& context) { 15 const CSSParserContext& context,
16 CSSPropertyID) {
16 DCHECK(RuntimeEnabledFeatures::cssIndependentTransformPropertiesEnabled()); 17 DCHECK(RuntimeEnabledFeatures::cssIndependentTransformPropertiesEnabled());
17 18
18 CSSValueID id = range.Peek().Id(); 19 CSSValueID id = range.Peek().Id();
19 if (id == CSSValueNone) 20 if (id == CSSValueNone)
20 return CSSPropertyParserHelpers::ConsumeIdent(range); 21 return CSSPropertyParserHelpers::ConsumeIdent(range);
21 22
22 CSSValue* scale = 23 CSSValue* scale =
23 CSSPropertyParserHelpers::ConsumeNumber(range, kValueRangeAll); 24 CSSPropertyParserHelpers::ConsumeNumber(range, kValueRangeAll);
24 if (!scale) 25 if (!scale)
25 return nullptr; 26 return nullptr;
26 CSSValueList* list = CSSValueList::CreateSpaceSeparated(); 27 CSSValueList* list = CSSValueList::CreateSpaceSeparated();
27 list->Append(*scale); 28 list->Append(*scale);
28 scale = CSSPropertyParserHelpers::ConsumeNumber(range, kValueRangeAll); 29 scale = CSSPropertyParserHelpers::ConsumeNumber(range, kValueRangeAll);
29 if (scale) { 30 if (scale) {
30 list->Append(*scale); 31 list->Append(*scale);
31 scale = CSSPropertyParserHelpers::ConsumeNumber(range, kValueRangeAll); 32 scale = CSSPropertyParserHelpers::ConsumeNumber(range, kValueRangeAll);
32 if (scale) 33 if (scale)
33 list->Append(*scale); 34 list->Append(*scale);
34 } 35 }
35 36
36 return list; 37 return list;
37 } 38 }
38 39
39 } // namespace blink 40 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698