Source/core/css/parser/CSSPropertyParser.cpp - Issue 1116593003: Move font-family check to CSSPropertyParser

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: Source/core/css/parser/CSSPropertyParser.cpp

Issue 1116593003: Move font-family check to CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: move check into CSSPropertyParser and add test Created 5 years, 8 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:

Index: Source/core/css/parser/CSSPropertyParser.cpp

diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp

index d13d2db2576c42833a3d18b6803b5cbffd6e57c2..03915783327cd93820a5f5926f09d14db19620a3 100644

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

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

@@ -4615,8 +4615,7 @@ PassRefPtrWillBeRawPtr<CSSValueList> CSSPropertyParser::parseFontFamily()

break;

}

familyBuilder.commit();

- if (!list->length())

+ if (!list->length() || (m_ruleType == StyleRule::FontFace && list->length() > 1))

list = nullptr;

return list.release();

}

« no previous file with comments | « Source/core/css/parser/CSSParserImpl.cpp ('k') | no next file » | no next file with comments »