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..7d3bc5f51f0631c747a958fd3b67afd5552bda43 100644 |
--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp |
+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp |
@@ -657,9 +657,14 @@ void StyleBuilderFunctions::applyInheritCSSPropertyContent(StyleResolverState&) |
void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& state, CSSValue* value) |
{ |
+ bool didSet = false; |
+ if (state.style()->hasPseudoElementStyle()) { |
+ state.style()->setContent(ContentDataNormal, didSet); |
+ return; |
+ } |
+ |
// list of string, uri, counter, attr, i |
- bool didSet = false; |
for (auto& item : toCSSValueList(*value)) { |
if (item->isImageGeneratorValue()) { |
state.style()->setContent(StyleGeneratedImage::create(toCSSImageGeneratorValue(*item)), didSet); |
@@ -724,8 +729,16 @@ void StyleBuilderFunctions::applyValueCSSPropertyContent(StyleResolverState& sta |
state.style()->setContent(NO_CLOSE_QUOTE, didSet); |
didSet = true; |
break; |
+ case CSSValueNormal: |
+ if (state.style()->styleType() == PseudoIdBefore || state.style()->styleType() == PseudoIdAfter) { |
+ state.style()->setContent(ContentDataNone, didSet); |
+ didSet = true; |
+ } else { |
+ didSet = false; |
+ } |
+ break; |
default: |
- // normal and none do not have any effect. |
+ // none does not have any effect. |
{ } |
} |
} |