third_party/WebKit/Source/core/css/FontFaceSet.cpp - Issue 2580793005: Split the CSSParserContext class out of CSSParserMode into its own file.

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/FontFaceSet.cpp

Issue 2580793005: Split the CSSParserContext class out of CSSParserMode into its own file. (Closed)

Patch Set: one extra missing include Created 4 years 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: third_party/WebKit/Source/core/css/FontFaceSet.cpp

diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp

index 0be1e5fce9b81441a5415cbc8c0afca1ffc54465..ef0c67c02fee4a61a702eb2a39af2c34249192f4 100644

--- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp

+++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp

@@ -445,7 +445,8 @@ bool FontFaceSet::resolveFontStyle(const String& fontString, Font& font) {

// CanvasRenderingContext2D.

MutableStylePropertySet* parsedStyle =

MutableStylePropertySet::create(HTMLStandardMode);

- CSSParser::parseValue(parsedStyle, CSSPropertyFont, fontString, true, 0);

+ CSSParser::parseValue(parsedStyle, CSSPropertyFont, fontString, true,

+ static_cast<StyleSheetContents*>(nullptr));

rune 2016/12/19 20:34:17 Do you need the static_cast?

Bret 2016/12/20 01:26:58 No, reverted. Sorry, this was left over from me sp

if (parsedStyle->isEmpty())

return false;