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

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

Issue 943463002: Initial implementation of font-size-adjust (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add some tests which need a rebaseline to TestExpectation Created 5 years, 10 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/resolver/CSSPropertyPriority.h ('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 a5aeb4ccaea3f2f52639cffa8d8e36e5ac9baebd..78242334f5650779961f7a91486e697fe3e0abc1 100644
--- a/Source/core/css/resolver/FontBuilder.h
+++ b/Source/core/css/resolver/FontBuilder.h
@@ -53,6 +53,7 @@ public:
void setWeight(FontWeight);
void setSize(const FontDescription::Size&);
+ void setSizeAdjust(const float aspectValue);
void setStretch(FontStretch);
void setFamilyDescription(const FontDescription::FamilyDescription&);
void setFeatureSettings(PassRefPtr<FontFeatureSettings>);
@@ -75,6 +76,7 @@ public:
static FontFeatureSettings* initialFeatureSettings() { return nullptr; }
static FontDescription::GenericFamilyType initialGenericFamily() { return FontDescription::StandardFamily; }
static FontDescription::Size initialSize() { return FontDescription::Size(FontSize::initialKeywordSize(), 0.0f, false); }
+ static float initialSizeAdjust() { return 0; }
static TextRenderingMode initialTextRendering() { return AutoTextRendering; }
static FontVariant initialVariant() { return FontVariantNormal; }
static FontDescription::VariantLigatures initialVariantLigatures() { return FontDescription::VariantLigatures(); }
@@ -93,6 +95,7 @@ private:
void checkForGenericFamilyChange(const FontDescription&, FontDescription&);
void updateSpecifiedSize(FontDescription&, const LayoutStyle&);
void updateComputedSize(FontDescription&, const LayoutStyle&);
+ void updateAdjustedSize(FontDescription&, const LayoutStyle&, FontSelector*);
float getComputedSizeFromSpecifiedSize(FontDescription&, float effectiveZoom, float specifiedSize);
@@ -107,6 +110,7 @@ private:
FeatureSettings,
Script,
Style,
+ SizeAdjust,
Variant,
VariantLigatures,
TextRendering,
« no previous file with comments | « Source/core/css/resolver/CSSPropertyPriority.h ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698