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

Unified Diff: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp

Issue 2697063003: Revert of SkScalarMul is deprecated (Closed)
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/config/SkUserConfig.h ('k') | ui/gfx/harfbuzz_font_skia.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
index b0603181e0a4585076dc349d3246fd56716a3608..e83296a135a594df65d9825ab7e6d0f917c76fcb 100644
--- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
+++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
@@ -258,8 +258,8 @@
if (typeface->getKerningPairAdjustments(glyphs, 2, kerningAdjustments)) {
SkScalar upm = SkIntToScalar(typeface->getUnitsPerEm());
SkScalar size = hbFontData->m_paint.getTextSize();
- return SkiaScalarToHarfBuzzPosition(SkIntToScalar(kerningAdjustments[0]) *
- size / upm);
+ return SkiaScalarToHarfBuzzPosition(
+ SkScalarMulDiv(SkIntToScalar(kerningAdjustments[0]), size, upm));
}
return 0;
« no previous file with comments | « skia/config/SkUserConfig.h ('k') | ui/gfx/harfbuzz_font_skia.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698