Don't convert to Sk48Dot16 in DrawOneGlyph.

src/core/SkDraw.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #define __STDC_LIMIT_MACROS
 
 #include "SkDraw.h"
 #include "SkBlitter.h"
@@ skipping 1437 matching lines @@
         : fUseRegionToDraw(UsingRegionToDraw(draw.fRC))
         , fGlyphCache(cache)
         , fBlitter(blitter)
         , fClip(fUseRegionToDraw ? &draw.fRC->bwRgn() : nullptr)
         , fDraw(draw)
         , fPaint(paint)
         , fClipBounds(PickClipBounds(draw)) { }
 
     void operator()(const SkGlyph& glyph, SkPoint position, SkPoint rounding) {
         position += rounding;
-        Sk48Dot16 fx = SkScalarTo48Dot16(position.fX);
-        Sk48Dot16 fy = SkScalarTo48Dot16(position.fY);
         // Prevent glyphs from being drawn outside of or straddling the edge of device space.
-        if ((fx >> 16) > INT_MAX - (INT16_MAX + UINT16_MAX) ||
-            (fx >> 16) < INT_MIN - (INT16_MIN + 0 /*UINT16_MIN*/) ||
-            (fy >> 16) > INT_MAX - (INT16_MAX + UINT16_MAX) ||
-            (fy >> 16) < INT_MIN - (INT16_MIN + 0 /*UINT16_MIN*/)) {
+        if (position.fX > INT_MAX - (INT16_MAX + UINT16_MAX) ||
+            position.fX < INT_MIN - (INT16_MIN + 0 /*UINT16_MIN*/) ||
+            position.fY > INT_MAX - (INT16_MAX + UINT16_MAX) ||
+            position.fY < INT_MIN - (INT16_MIN + 0 /*UINT16_MIN*/)) {
             return;
         }
 
-        int left = Sk48Dot16FloorToInt(fx);
-        int top  = Sk48Dot16FloorToInt(fy);
+        int left = SkScalarFloorToInt(position.fX);
+        int top  = SkScalarFloorToInt(position.fY);
         SkASSERT(glyph.fWidth > 0 && glyph.fHeight > 0);
 
         left += glyph.fLeft;
         top  += glyph.fTop;
 
         int right   = left + glyph.fWidth;
         int bottom  = top  + glyph.fHeight;
 
         SkMask mask;
         mask.fBounds.set(left, top, right, bottom);
@@ skipping 591 matching lines @@
         mask->fImage = SkMask::AllocImage(size);
         memset(mask->fImage, 0, mask->computeImageSize());
     }
 
     if (SkMask::kJustComputeBounds_CreateMode != mode) {
         draw_into_mask(*mask, devPath, style);
     }
 
     return true;
 }