commit 3193ff271628b62b0d1428c191fac0c9437ce458
author Ben Wagner <bungeman@google.com> Wed Jan 20 18:34:14 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 22 20:54:25 2021 +0000
tree 53a43fc7ee1f41d1b281ed6fb7fdedb0d14e55fb
parent 4ecab92584557c1a08e6edced5b0fdd2496eb2f0

Remove SK_SHAPER_HARFBUZZ_USE_BAD_SCALE

No longer used. Remove old numerically unstable scaling.

Change-Id: I3aa05369167377e0277eaca155536c2f1e8036b3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/356379
Reviewed-by: Julia Lavrova <jlavrova@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

modules/skshaper/src/SkShaper_harfbuzz.cpp

diff --git a/modules/skshaper/src/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp
index 6b3cb59..ca4e298 100644
--- a/modules/skshaper/src/SkShaper_harfbuzz.cpp
+++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp
@@ -1365,16 +1365,9 @@
                     font.currentFont(), bidi.currentLevel(),
                     std::unique_ptr<ShapedGlyph[]>(new ShapedGlyph[len]), len);
 
-#if SK_SHAPER_HARFBUZZ_USE_BAD_SCALE
-    int scaleX, scaleY;
-    hb_font_get_scale(hbFont.get(), &scaleX, &scaleY);
-    double SkScalarFromHBPosY = -(run.fFont.getSize() / scaleY);
-    double SkScalarFromHBPosX = run.fFont.getSize() / scaleX * run.fFont.getScaleX();
-#else
     // Undo skhb_position with (1.0/(1<<16)) and scale as needed.
     double SkScalarFromHBPosX = +(1.52587890625e-5) * run.fFont.getScaleX();
     double SkScalarFromHBPosY = -(1.52587890625e-5);  // HarfBuzz y-up, Skia y-down
-#endif
     SkVector runAdvance = { 0, 0 };
     for (unsigned i = 0; i < len; i++) {
         ShapedGlyph& glyph = run.fGlyphs[i];