Remove unnecessary size argument to metrics function

The changes to metric consumption rendered the size argument
unnecessary, remove it.
This commit is contained in:
Aaron Williamson 2017-04-22 14:01:25 -06:00 committed by Joe Wilm
parent 7fc50f6690
commit 1277e07671
4 changed files with 5 additions and 7 deletions

View File

@ -135,9 +135,7 @@ impl ::Rasterize for Rasterizer {
}
/// Get metrics for font specified by FontKey
fn metrics(&self, key: FontKey, _size: Size) -> Result<Metrics, Error> {
// NOTE size is not needed here since the font loaded already contains
// it. It's part of the API due to platform differences.
fn metrics(&self, key: FontKey) -> Result<Metrics, Error> {
let font = self.fonts
.get(&key)
.ok_or(Error::FontNotLoaded)?;

View File

@ -54,7 +54,7 @@ impl ::Rasterize for FreeTypeRasterizer {
})
}
fn metrics(&self, key: FontKey, size: Size) -> Result<Metrics, Error> {
fn metrics(&self, key: FontKey) -> Result<Metrics, Error> {
let face = self.faces
.get(&key)
.ok_or(Error::FontNotLoaded)?;

View File

@ -229,8 +229,8 @@ pub trait Rasterize {
fn new(dpi_x: f32, dpi_y: f32, device_pixel_ratio: f32, use_thin_strokes: bool) -> Result<Self, Self::Err>
where Self: Sized;
/// Get `Metrics` for the given `FontKey` and `Size`
fn metrics(&self, FontKey, Size) -> Result<Metrics, Self::Err>;
/// Get `Metrics` for the given `FontKey`
fn metrics(&self, FontKey) -> Result<Metrics, Self::Err>;
/// Load the font described by `FontDesc` and `Size`
fn load_font(&mut self, &FontDesc, Size) -> Result<FontKey, Self::Err>;

View File

@ -246,7 +246,7 @@ impl GlyphCache {
pub fn font_metrics(&self) -> font::Metrics {
self.rasterizer
.metrics(self.font_key, self.font_size)
.metrics(self.font_key)
.expect("metrics load since font is loaded at glyph cache creation")
}