third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp - Issue 1812763002: Pseudo and non pseudo elements should return correct computed content value

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/StyleBuilderCustom.cpp

Issue 1812763002: Pseudo and non pseudo elements should return correct computed content value (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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

« third_party/WebKit/LayoutTests/fast/css/getComputedStyle/disallowed-url-serialization.html ('K') | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 845a3f092c3c62ef4647eb9c56f39931f049ea20..29153c4e3b2aca1dc4eb31eb6f62d29b076f3975 100644

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

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

@@ -657,8 +657,15 @@ void StyleBuilderFunctions::applyInheritCSSPropertyContent(StyleResolverState&)

void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& state, CSSValue* value)

{

- // list of string, uri, counter, attr, i

+ if (value->isPrimitiveValue()) {

+ CSSValueID cssValueID = toCSSPrimitiveValue(*value).getValueID();

+ if (cssValueID == CSSValueNormal || cssValueID == CSSValueNone) {

+ state.style()->clearContent();

+ return;

+ }

+ // list of string, uri, counter, attr, i

bool didSet = false;

for (auto& item : toCSSValueList(*value)) {

if (item->isImageGeneratorValue()) {