third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp - Issue 1510963002: Ensure we don't crash when asking for variables that don't exist from the computed 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/CSSComputedStyleDeclaration.cpp

Issue 1510963002: Ensure we don't crash when asking for variables that don't exist from the computed style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: dammit tim Created 5 years 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/LayoutTests/fast/css/variables/read-from-computed-style.html ('k') | third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp

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

index d48c9b646cb182520c5e8bf76115bfd3637220e8..da497fdda56c1c08a7122a6283a7926e3abd0a7b 100644

--- a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp

+++ b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp

@@ -641,9 +641,12 @@ String CSSComputedStyleDeclaration::getPropertyValue(const String& propertyName)

{

CSSPropertyID propertyID = cssPropertyID(propertyName);

if (!propertyID) {

- if (!RuntimeEnabledFeatures::cssVariablesEnabled() || !CSSVariableParser::isValidVariableName(propertyName))

- return String();

- return getPropertyCSSValue(AtomicString(propertyName))->cssText();

+ if (RuntimeEnabledFeatures::cssVariablesEnabled() && CSSVariableParser::isValidVariableName(propertyName)) {

+ RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(AtomicString(propertyName));

+ if (value)

+ return value->cssText();

+ }

+ return String();

}

ASSERT(CSSPropertyMetadata::isEnabledProperty(propertyID));

return getPropertyValue(propertyID);