ui/gfx/harfbuzz_font_skia.cc - Issue 2693423004: SkScalarMul is deprecated

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/harfbuzz_font_skia.cc

Issue 2693423004: SkScalarMul is deprecated (Closed)

Patch Set: undo the ImageGenerator flag change Created 3 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:

Index: ui/gfx/harfbuzz_font_skia.cc

diff --git a/ui/gfx/harfbuzz_font_skia.cc b/ui/gfx/harfbuzz_font_skia.cc

index 4f5d3078dcf76eb55eb34bbf2ca6e1b3b619170f..12d7bb19b2e99e3e5460730ceee564611c8c9625 100644

--- a/ui/gfx/harfbuzz_font_skia.cc

+++ b/ui/gfx/harfbuzz_font_skia.cc

@@ -132,8 +132,8 @@ hb_position_t GetGlyphKerning(FontData* font_data,

SkScalar upm = SkIntToScalar(typeface->getUnitsPerEm());

SkScalar size = font_data->paint_.getTextSize();

- return SkiaScalarToHarfBuzzUnits(

- SkScalarMulDiv(SkIntToScalar(kerning_adjustments[0]), size, upm));

+ return SkiaScalarToHarfBuzzUnits(SkIntToScalar(kerning_adjustments[0]) *

+ size / upm);

}

hb_position_t GetGlyphHorizontalKerning(hb_font_t* font,