Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Unified Diff: third_party/WebKit/Source/core/css/resolver/FontBuilder.h

Issue 2558053002: Add CSS support for font-variation-settings (Closed)
Patch Set: DCHECK corrected, newline removed. 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
Index: third_party/WebKit/Source/core/css/resolver/FontBuilder.h
diff --git a/third_party/WebKit/Source/core/css/resolver/FontBuilder.h b/third_party/WebKit/Source/core/css/resolver/FontBuilder.h
index e2943ca3b00d9672db54ee84b1e05336d5737c08..6d1ba5305b58237fdc00322e829fd1d06d173a9d 100644
--- a/third_party/WebKit/Source/core/css/resolver/FontBuilder.h
+++ b/third_party/WebKit/Source/core/css/resolver/FontBuilder.h
@@ -70,6 +70,7 @@ class CORE_EXPORT FontBuilder {
void setTextRendering(TextRenderingMode);
void setKerning(FontDescription::Kerning);
void setFontSmoothing(FontSmoothingMode);
+ void setVariationSettings(PassRefPtr<FontVariationSettings>);
// FIXME: These need to just vend a Font object eventually.
void createFont(FontSelector*, ComputedStyle&);
@@ -82,6 +83,7 @@ class CORE_EXPORT FontBuilder {
return FontDescription::FamilyDescription(initialGenericFamily());
}
static FontFeatureSettings* initialFeatureSettings() { return nullptr; }
+ static FontVariationSettings* initialVariationSettings() { return nullptr; }
static FontDescription::GenericFamilyType initialGenericFamily() {
return FontDescription::StandardFamily;
}
@@ -141,6 +143,7 @@ class CORE_EXPORT FontBuilder {
VariantCaps,
VariantLigatures,
VariantNumeric,
+ VariationSettings,
TextRendering,
Kerning,
FontSmoothing,

Powered by Google App Engine
This is Rietveld 408576698