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

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

Issue 2801893003: Revert of Changed CSSParserContext argument from * to & for null safety. (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/CSSPropertyAPIGridAutoFlow.h" 5 #include "core/css/properties/CSSPropertyAPIGridAutoFlow.h"
6 6
7 #include "core/css/CSSIdentifierValue.h" 7 #include "core/css/CSSIdentifierValue.h"
8 #include "core/css/CSSValueList.h" 8 #include "core/css/CSSValueList.h"
9 #include "core/css/parser/CSSPropertyParserHelpers.h" 9 #include "core/css/parser/CSSPropertyParserHelpers.h"
10 #include "platform/RuntimeEnabledFeatures.h" 10 #include "platform/RuntimeEnabledFeatures.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 const CSSValue* CSSPropertyAPIGridAutoFlow::parseSingleValue( 14 const CSSValue* CSSPropertyAPIGridAutoFlow::parseSingleValue(
15 CSSParserTokenRange& range, 15 CSSParserTokenRange& range,
16 const CSSParserContext& context) { 16 const CSSParserContext* context) {
17 DCHECK(RuntimeEnabledFeatures::cssGridLayoutEnabled()); 17 DCHECK(RuntimeEnabledFeatures::cssGridLayoutEnabled());
18 CSSIdentifierValue* rowOrColumnValue = 18 CSSIdentifierValue* rowOrColumnValue =
19 CSSPropertyParserHelpers::consumeIdent<CSSValueRow, CSSValueColumn>( 19 CSSPropertyParserHelpers::consumeIdent<CSSValueRow, CSSValueColumn>(
20 range); 20 range);
21 CSSIdentifierValue* denseAlgorithm = 21 CSSIdentifierValue* denseAlgorithm =
22 CSSPropertyParserHelpers::consumeIdent<CSSValueDense>(range); 22 CSSPropertyParserHelpers::consumeIdent<CSSValueDense>(range);
23 if (!rowOrColumnValue) { 23 if (!rowOrColumnValue) {
24 rowOrColumnValue = 24 rowOrColumnValue =
25 CSSPropertyParserHelpers::consumeIdent<CSSValueRow, CSSValueColumn>( 25 CSSPropertyParserHelpers::consumeIdent<CSSValueRow, CSSValueColumn>(
26 range); 26 range);
27 if (!rowOrColumnValue && !denseAlgorithm) 27 if (!rowOrColumnValue && !denseAlgorithm)
28 return nullptr; 28 return nullptr;
29 } 29 }
30 CSSValueList* parsedValues = CSSValueList::createSpaceSeparated(); 30 CSSValueList* parsedValues = CSSValueList::createSpaceSeparated();
31 if (rowOrColumnValue) 31 if (rowOrColumnValue)
32 parsedValues->append(*rowOrColumnValue); 32 parsedValues->append(*rowOrColumnValue);
33 if (denseAlgorithm) 33 if (denseAlgorithm)
34 parsedValues->append(*denseAlgorithm); 34 parsedValues->append(*denseAlgorithm);
35 return parsedValues; 35 return parsedValues;
36 } 36 }
37 37
38 } // namespace blink 38 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698