Revert of Generate Signed Distance Field directly from vector path

src/gpu/text/GrFontScaler.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrFontScaler.h"
 #include "SkDescriptor.h"
 #include "SkDistanceFieldGen.h"
-#include "GrDistanceFieldGenFromVector.h"
 #include "SkGlyphCache.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 GrFontScaler::GrFontScaler(SkGlyphCache* strike) {
     fStrike = strike;
     fKey = nullptr;
 }
 
 GrFontScaler::~GrFontScaler() {
@@ skipping 141 matching lines @@
             src = (const char*)src + srcRB;
             dst = (char*)dst + dstRB;
         }
     }
     return true;
 }
 
 bool GrFontScaler::getPackedGlyphDFImage(const SkGlyph& glyph, int width, int height, void* dst) {
     SkASSERT(glyph.fWidth + 2*SK_DistanceFieldPad == width);
     SkASSERT(glyph.fHeight + 2*SK_DistanceFieldPad == height);
-    const SkPath* path = fStrike->findPath(glyph);
-    if (nullptr == path) {
+    const void* image = fStrike->findImage(glyph);
+    if (nullptr == image) {
+        return false;
+    }
+    // now generate the distance field
+    SkASSERT(dst);
+    SkMask::Format maskFormat = static_cast<SkMask::Format>(glyph.fMaskFormat);
+    if (SkMask::kA8_Format == maskFormat) {
+        // make the distance field from the image
+        SkGenerateDistanceFieldFromA8Image((unsigned char*)dst,
+                                           (unsigned char*)image,
+                                           glyph.fWidth, glyph.fHeight,
+                                           glyph.rowBytes());
+    } else if (SkMask::kBW_Format == maskFormat) {
+        // make the distance field from the image
+        SkGenerateDistanceFieldFromBWImage((unsigned char*)dst,
+                                           (unsigned char*)image,
+                                           glyph.fWidth, glyph.fHeight,
+                                           glyph.rowBytes());
+    } else {
         return false;
     }
 
-    SkMatrix drawMatrix;
-    drawMatrix.setTranslate((SkScalar)-glyph.fLeft, (SkScalar)-glyph.fTop);
-
-    // now generate the distance field
-    SkASSERT(dst);
-    // Generate signed distance field directly from SkPath
-    GrGenerateDistanceFieldFromPath((unsigned char*)dst,
-                                    *path, drawMatrix,
-                                    width, height, width * sizeof(unsigned char));
-
     return true;
 }
 
 const SkPath* GrFontScaler::getGlyphPath(const SkGlyph& glyph) {
     return fStrike->findPath(glyph);
 }
 
 const SkGlyph& GrFontScaler::grToSkGlyph(GrGlyph::PackedID id) {
     return fStrike->getGlyphIDMetrics(GrGlyph::UnpackID(id),
                                       GrGlyph::UnpackFixedX(id),
                                       GrGlyph::UnpackFixedY(id));
 }