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

Unified Diff: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.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
Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
index 3fd81406fd2c62285fd53822d4d9d94ebbcec537..1c8067cac6444477cdadbdb14c011fa0092b4e01 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -2328,12 +2328,16 @@ static PassRefPtrWillBeRawPtr<CSSValue> consumeCounterContent(CSSParserTokenRang
return CSSCounterValue::create(identifier.release(), listStyle.release(), separator.release());
}
-static PassRefPtrWillBeRawPtr<CSSValueList> consumeContent(CSSParserTokenRange& range, CSSParserContext context)
+static PassRefPtrWillBeRawPtr<CSSValue> consumeContent(CSSParserTokenRange& range, CSSParserContext context)
{
+ RefPtrWillBeRawPtr<CSSValue> parsedValue = consumeIdent<CSSValueNone, CSSValueNormal>(range);
Timothy Loh 2016/03/22 23:25:27 btw we've been using identMatches elsewhere, that'
nainar 2016/03/23 02:50:49 Using identMatches now
+ if (parsedValue)
+ return parsedValue;
+
RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
do {
- RefPtrWillBeRawPtr<CSSValue> parsedValue = consumeImage(range, context);
+ parsedValue = consumeImage(range, context);
if (!parsedValue)
parsedValue = consumeIdent<CSSValueOpenQuote, CSSValueCloseQuote, CSSValueNoOpenQuote, CSSValueNoCloseQuote, CSSValueNormal>(range);
alancutter (OOO until 2018) 2016/03/22 09:35:23 We shouldn't be accepting CSSValueNormal here.
nainar 2016/03/23 02:50:49 Done.
if (!parsedValue)

Powered by Google App Engine
This is Rietveld 408576698