Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(264)

Unified Diff: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.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
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css/getComputedStyle/getComputedStyle-content.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
index 82158100fcd84ad2a1b26eed060053aafc4056a3..4bd132f288bd73ebb92c9ad43488fd412644138a 100644
--- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
+++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
@@ -2379,6 +2379,12 @@ PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(CSSPropertyID
case CSSPropertyTextOrientation:
return CSSPrimitiveValue::create(style.getTextOrientation());
case CSSPropertyContent:
+ if (!style.hasContent()) {
+ if (style.styleType() == PseudoIdBefore || style.styleType() == PseudoIdAfter)
+ return cssValuePool().createIdentifierValue(CSSValueNone);
+ if (!styledNode->isPseudoElement())
+ return cssValuePool().createIdentifierValue(CSSValueNormal);
alancutter (OOO until 2018) 2016/03/17 06:40:24 Should this be guarded by !style.hasContent()?
nainar 2016/03/17 06:54:24 As far as I understand from https://www.w3.org/TR/
+ }
return valueForContentData(style);
case CSSPropertyCounterIncrement:
return valueForCounterDirectives(style, propertyID);
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/css/getComputedStyle/getComputedStyle-content.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698