third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h - Issue 2558053002: Add CSS support for font-variation-settings

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.h

Issue 2558053002: Add CSS support for font-variation-settings (Closed)

Patch Set: Remove empty if statement 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:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('K') | « third_party/WebKit/Source/core/css/resolver/FontBuilder.cpp ('k') | third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp » ('j') | third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e3a9a9634ca2c632da07ed95dedf553155b48f17..158d2880f33c20692215b9041632dce7ebe0bdcc 100644

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

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

@@ -81,6 +81,9 @@ class StyleBuilderConverter {

static PassRefPtr<FontFeatureSettings> convertFontFeatureSettings(

StyleResolverState&,

const CSSValue&);

+ static PassRefPtr<FontVariationSettings> convertFontVariationSettings(

+ StyleResolverState&,

+ const CSSValue&);

static FontDescription::Size convertFontSize(StyleResolverState&,

const CSSValue&);

static float convertFontSizeAdjust(StyleResolverState&, const CSSValue&);