Source/core/css/CSSPrimitiveValue.cpp - Issue 92383002: Mark AtomicString(StringImpl*) constructor as explicit

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: Source/core/css/CSSPrimitiveValue.cpp

Issue 92383002: Mark AtomicString(StringImpl*) constructor as explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 1 month 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

Index: Source/core/css/CSSPrimitiveValue.cpp

diff --git a/Source/core/css/CSSPrimitiveValue.cpp b/Source/core/css/CSSPrimitiveValue.cpp

index a83fd88b20c41de16faedcd26909e7a0b33a6256..d2008f18de7dc2b77630fd6947ad112f16bfc223 100644

--- a/Source/core/css/CSSPrimitiveValue.cpp

+++ b/Source/core/css/CSSPrimitiveValue.cpp

@@ -1118,8 +1118,11 @@ String CSSPrimitiveValue::customCSSText(CSSTextFormattingFlags formattingFlag) c

String CSSPrimitiveValue::customSerializeResolvingVariables(const HashMap<AtomicString, String>& variables) const

{

- if (isVariableName() && variables.contains(m_value.string))

- return variables.get(m_value.string);

+ if (isVariableName()) {

+ AtomicString variableName(m_value.string);

+ if (variables.contains(variableName))

+ return variables.get(variableName);

+ }

if (CSSCalcValue* calcValue = cssCalcValue())

return calcValue->customSerializeResolvingVariables(variables);

if (Pair* pairValue = getPairValue())

« no previous file with comments | « no previous file | Source/core/css/resolver/SharedStyleFinder.cpp » ('j') | Source/wtf/text/AtomicString.h » ('J')