third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp - Issue 1837413002: Ensure that we don't allow 'none' alongside other values in content property

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/parser/CSSPropertyParser.cpp

Issue 1837413002: Ensure that we don't allow 'none' alongside other values in content property (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/css-parser/content-parsing-invalid.html ('K') | « third_party/WebKit/LayoutTests/css-parser/content-parsing-invalid.html ('k') | third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a3b2bfb1add620460d351e7849110c779ccc64db..fbedf5ad08a821e0fdd593cc1ddb30a09c8115f9 100644

--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

@@ -2331,13 +2331,13 @@ static PassRefPtrWillBeRawPtr<CSSValue> consumeCounterContent(CSSParserTokenRang

static PassRefPtrWillBeRawPtr<CSSValue> consumeContent(CSSParserTokenRange& range, CSSParserContext context)

{

- if (identMatches<CSSValueNormal>(range.peek().id()))

+ if (identMatches<CSSValueNone, CSSValueNormal>(range.peek().id()))

return consumeIdent(range);

RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();

do {

- RefPtrWillBeRawPtr<CSSValue> parsedValue = consumeImageOrNone(range, context);

+ RefPtrWillBeRawPtr<CSSValue> parsedValue = consumeImage(range, context);

if (!parsedValue)

parsedValue = consumeIdent<CSSValueOpenQuote, CSSValueCloseQuote, CSSValueNoOpenQuote, CSSValueNoCloseQuote>(range);

if (!parsedValue)