third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp - Issue 1778743003: Make <custom-ident> not insert quotes

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/resolver/StyleBuilderConverter.cpp

Issue 1778743003: Make <custom-ident> not insert quotes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Also fix FontFace.cpp 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/Source/core/css/CSSValuePool.h ('K') | « third_party/WebKit/Source/core/css/FontFace.cpp ('k') | third_party/WebKit/Source/core/editing/EditingStyle.cpp » ('j') | third_party/WebKit/Source/core/editing/EditingStyle.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

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

index fd342613ea19d225c64ec20ef1ab92bd34b1ffb6..6a3dfe14843c41b22a7343deb8d1a98587e2f8dd 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

@@ -142,9 +142,9 @@ static FontDescription::GenericFamilyType convertGenericFamily(CSSValueID valueI

static bool convertFontFamilyName(StyleResolverState& state, CSSValue& value,

FontDescription::GenericFamilyType& genericFamily, AtomicString& familyName)

{

- if (value.isCustomIdentValue()) {

+ if (value.isFontFamilyValue()) {

genericFamily = FontDescription::NoFamily;

- familyName = AtomicString(toCSSCustomIdentValue(value).value());

+ familyName = AtomicString(toCSSFontFamilyValue(value).value());

} else if (state.document().settings()) {

genericFamily = convertGenericFamily(toCSSPrimitiveValue(value).getValueID());

familyName = state.fontBuilder().genericFontFamilyName(genericFamily);