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

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

Issue 444333005: Remove custom style building for -webkit-font-feature-settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/FontBuilder.h
diff --git a/Source/core/css/resolver/FontBuilder.h b/Source/core/css/resolver/FontBuilder.h
index e4a9cafac0c535946e2fcdaa6f9f0ccc4c9c697f..f325a8a614bf10150ccf1d7a203dab2f456b68d5 100644
--- a/Source/core/css/resolver/FontBuilder.h
+++ b/Source/core/css/resolver/FontBuilder.h
@@ -63,10 +63,7 @@ public:
void setWeight(FontWeight);
void setStretch(FontStretch);
-
- void setFeatureSettingsNormal();
- void setFeatureSettingsValue(CSSValue*);
-
+ void setFeatureSettings(PassRefPtr<FontFeatureSettings>);
void setScript(const String& locale);
void setStyle(FontStyle);
void setVariant(FontVariant);
@@ -88,6 +85,7 @@ public:
// FIXME: This is only used by an ASSERT in StyleResolver. Remove?
bool fontDirty() const { return m_fontDirty; }
+ static FontFeatureSettings* initialFeatureSettings() { return nullptr; }
static FontDescription::GenericFamilyType initialGenericFamily() { return FontDescription::NoFamily; }
static TextRenderingMode initialTextRendering() { return AutoTextRendering; }
static FontVariant initialVariant() { return FontVariantNormal; }
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698