third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp - Issue 1729013002: blink: Rename enums and functions to not collide with chromium style.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp

Issue 1729013002: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-3: . Created 4 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/css/parser/MediaQueryParser.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorStyleSheet.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp

diff --git a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp

index 21ba3a2570db92fc01d57ed7d1656a39d04cb1ee..ace65cc6640890f98e432b6dc9a03eb46fd40026 100644

--- a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp

@@ -113,7 +113,7 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSVariableResolver::resolveVariableReferences(

CSSParserContext context(HTMLStandardMode, nullptr);

WillBeHeapVector<CSSProperty, 256> parsedProperties;

// TODO(timloh): This should be CSSParser::parseSingleValue and not need a vector.

- if (!CSSPropertyParser::parseValue(id, false, CSSParserTokenRange(tokens), context, parsedProperties, StyleRule::Type::Style))

+ if (!CSSPropertyParser::parseValue(id, false, CSSParserTokenRange(tokens), context, parsedProperties, StyleRule::RuleType::Style))

return cssValuePool().createUnsetValue();

ASSERT(parsedProperties.size() == 1);

return parsedProperties[0].value();

@@ -129,7 +129,7 @@ void CSSVariableResolver::resolveAndApplyVariableReferences(StyleResolverState&

WillBeHeapVector<CSSProperty, 256> parsedProperties;

- if (CSSPropertyParser::parseValue(id, false, CSSParserTokenRange(tokens), context, parsedProperties, StyleRule::Type::Style)) {

+ if (CSSPropertyParser::parseValue(id, false, CSSParserTokenRange(tokens), context, parsedProperties, StyleRule::RuleType::Style)) {

unsigned parsedPropertiesCount = parsedProperties.size();

for (unsigned i = 0; i < parsedPropertiesCount; ++i)

StyleBuilder::applyProperty(parsedProperties[i].id(), state, parsedProperties[i].value());