remove unused cruft

Bug: skia:
Change-Id: I41c66d87a82afaf0835b88ee8599e6da0d2a5f58
Reviewed-on: https://skia-review.googlesource.com/c/191424
Commit-Queue: Mike Reed <[email protected]>
Reviewed-by: Mike Reed <[email protected]>
Auto-Submit: Mike Reed <[email protected]>

Author: reed-at-google

include/core/SkFont.h

@@ -511,7 +511,6 @@ class SK_API SkFont {
     friend class SkCanonicalizeFont;
     friend class SkFontPriv;
     friend class SkGlyphRunListPainter;
-    friend class SkPaint;
     friend class SkTextBlobCacheDiffCanvas;
     friend class SVGTextBuilder;
 };

include/core/SkPaint.h

@@ -32,7 +32,6 @@ class SkImageFilter;
 class SkMaskFilter;
 class SkPath;
 class SkPathEffect;
-struct SkPoint;
 class SkShader;
 
 /** \class SkPaint

src/core/SkFont.cpp

@@ -413,20 +413,6 @@ sk_sp<SkTypeface> SkFont::refTypefaceOrDefault() const {
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-int SkFontPriv::ValidCountText(const void* text, size_t length, SkTextEncoding encoding) {
-    switch (encoding) {
-        case kUTF8_SkTextEncoding: return SkUTF::CountUTF8((const char*)text, length);
-        case kUTF16_SkTextEncoding: return SkUTF::CountUTF16((const uint16_t*)text, length);
-        case kUTF32_SkTextEncoding: return SkUTF::CountUTF32((const int32_t*)text, length);
-        case kGlyphID_SkTextEncoding:
-            if (!SkIsAlign2(intptr_t(text)) || !SkIsAlign2(length)) {
-                return -1;
-            }
-            return length >> 1;
-    }
-    return -1;
-}
-
 void SkFontPriv::ScaleFontMetrics(SkFontMetrics* metrics, SkScalar scale) {
     metrics->fTop *= scale;
     metrics->fAscent *= scale;

src/core/SkFontPriv.h

@@ -54,9 +54,6 @@ class SkFontPriv {
 
     static void ScaleFontMetrics(SkFontMetrics*, SkScalar);
 
-    // returns -1 if buffer is invalid for specified encoding
-    static int ValidCountText(const void* text, size_t length, SkTextEncoding);
-
     /**
         Returns the union of bounds of all glyphs.
         Returned dimensions are computed by font manager from font data,
@@ -71,9 +68,9 @@ class SkFontPriv {
     static SkRect GetFontBounds(const SkFont&);
 
     static bool IsFinite(const SkFont& font) {
-        return SkScalarIsFinite(font.fSize) &&
-               SkScalarIsFinite(font.fScaleX) &&
-               SkScalarIsFinite(font.fSkewX);
+        return SkScalarIsFinite(font.getSize()) &&
+               SkScalarIsFinite(font.getScaleX()) &&
+               SkScalarIsFinite(font.getSkewX());
     }
 
     // Returns the number of elements (characters or glyphs) in the array.