aboutsummaryrefslogtreecommitdiffstats
path: root/include/core
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-12 09:31:05 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-05-12 09:31:05 -0700
commit4701b5d25c5617888ea754f373946c57534750cb (patch)
tree38239363ca638a7616c164c671eef090a40d273b /include/core
parentff1f66966879e612660387285b7ead9c040ff88f (diff)
parentc5875bc07007dd8e8d5e913044b53031ebff8d12 (diff)
downloadexternal_skia-4701b5d25c5617888ea754f373946c57534750cb.zip
external_skia-4701b5d25c5617888ea754f373946c57534750cb.tar.gz
external_skia-4701b5d25c5617888ea754f373946c57534750cb.tar.bz2
merge from open-source master
Change-Id: Ic7024b390883841714ac6fb5f6a11f87a9f707a6
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkFontHost.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/core/SkFontHost.h b/include/core/SkFontHost.h
index ec34583..84e575f 100644
--- a/include/core/SkFontHost.h
+++ b/include/core/SkFontHost.h
@@ -266,6 +266,16 @@ public:
static void SetSubpixelOrder(LCDOrder order);
static LCDOrder GetSubpixelOrder();
+
+ ///////////////////////////////////////////////////////////////////////////
+
+ /**
+ * Return the number of font units per em.
+ *
+ * @param fontID the font to query.
+ * @return the number of font units per em or 0 on error.
+ */
+ static uint32_t GetUnitsPerEm(SkFontID fontID);
};
#endif