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

SkTypeface: remove old virtual onGetAdvancedMetrics, since https://crrev.com/2860293003

Browse Source 
Change-Id: Iad30b03fc8b34bdea2fe902f83a0dd979c16f1a7
Reviewed-on: https://skia-review.googlesource.com/15633
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
This commit is contained in:
Hal Canary 2017-05-05 14:08:25 -04:00 committed by Skia Commit-Bot
parent b1485f2a05
commit 2627b0473f
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/core/SkTypeface.h
View File

@ -343,17 +343,9 @@ protected:
virtual SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,
const SkDescriptor*) const = 0;
virtual void onFilterRec(SkScalerContextRec*) const = 0;
virtual std::unique_ptr<SkAdvancedTypefaceMetrics> onGetAdvancedMetrics() const;
enum PerGlyphInfo {
kNo_PerGlyphInfo = 0x0,
kGlyphNames_PerGlyphInfo = 0x1,
kToUnicode_PerGlyphInfo = 0x2
};
virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
PerGlyphInfo, const uint32_t*, uint32_t) const {
return nullptr;
}
// Subclasses *must* override this method to work with the PDF backend.
virtual std::unique_ptr<SkAdvancedTypefaceMetrics> onGetAdvancedMetrics() const;
virtual SkStreamAsset* onOpenStream(int* ttcIndex) const = 0;
// TODO: make pure virtual.

1
src/core/SkTypeface.cpp
View File

@ -366,5 +366,6 @@ bool SkTypeface::onComputeBounds(SkRect* bounds) const {
}
std::unique_ptr<SkAdvancedTypefaceMetrics> SkTypeface::onGetAdvancedMetrics() const {
SkDEBUGFAIL("Typefaces that need to work with PDF backend must override this.");
return nullptr;
}