AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove unused cruft

Browse Source 
Bug: skia:
Change-Id: I41c66d87a82afaf0835b88ee8599e6da0d2a5f58
Reviewed-on: https://skia-review.googlesource.com/c/191424
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2019-02-11 20:26:12 -05:00 committed by Skia Commit-Bot
parent b69179b9a1
commit 233fc0b03c
4 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/core/SkFont.h
View File

@ -511,7 +511,6 @@ private:
friend class SkCanonicalizeFont;
friend class SkFontPriv;
friend class SkGlyphRunListPainter;
friend class SkPaint;
friend class SkTextBlobCacheDiffCanvas;
friend class SVGTextBuilder;
};

1
include/core/SkPaint.h
View File

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

14
src/core/SkFont.cpp
View File

@ -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;

9
src/core/SkFontPriv.h
View File

@ -54,9 +54,6 @@ public:
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 @@ public:
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.