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

Revert "Revert "Remove gCreateTypefaceDelegate.""

Browse Source 
This reverts commit 58a1605d2b.
Try to make glyph paths as immutable as possible.

Change-Id: Ibef920c4417304e37ca4d4384515e9e7fc31aabf
Reviewed-on: https://skia-review.googlesource.com/139172
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Herb Derby <herb@google.com>
This commit is contained in:
Ben Wagner 2018-07-03 16:15:54 -04:00 committed by Skia Commit-Bot
parent 44bad2e86a
commit 9eb1c7d80f
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dm/DM.cpp
View File

@ -1291,20 +1291,6 @@ static void run_test(skiatest::Test test, const GrContextOptions& grCtxOptions)
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
#define PORTABLE_FONT_PREFIX "Toy Liberation "
static sk_sp<SkTypeface> create_from_name(const char familyName[], SkFontStyle style) {
if (familyName && strlen(familyName) > sizeof(PORTABLE_FONT_PREFIX)
&& !strncmp(familyName, PORTABLE_FONT_PREFIX, sizeof(PORTABLE_FONT_PREFIX) - 1)) {
return sk_tool_utils::create_portable_typeface(familyName, style);
}
return nullptr;
}
#undef PORTABLE_FONT_PREFIX
extern sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char [], SkFontStyle );
int main(int argc, char** argv) { int main(int argc, char** argv) {
#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_HAS_HEIF_LIBRARY) #if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && defined(SK_HAS_HEIF_LIBRARY)
android::ProcessState::self()->startThreadPool(); android::ProcessState::self()->startThreadPool();
@ -1357,7 +1343,6 @@ int main(int argc, char** argv) {
JsonWriter::DumpJson(); // It's handy for the bots to assume this is ~never missing. JsonWriter::DumpJson(); // It's handy for the bots to assume this is ~never missing.
SkAutoGraphics ag; SkAutoGraphics ag;
SkTaskGroup::Enabler enabled(FLAGS_threads); SkTaskGroup::Enabler enabled(FLAGS_threads);
gCreateTypefaceDelegate = &create_from_name;
if (nullptr == GetResourceAsData("images/color_wheel.png")) { if (nullptr == GetResourceAsData("images/color_wheel.png")) {
info("Some resources are missing. Do you need to set --resourcePath?\n"); info("Some resources are missing. Do you need to set --resourcePath?\n");

2
src/core/SkGlyphCache.cpp
View File

@ -225,6 +225,8 @@ const SkPath* SkGlyphCache::findPath(const SkGlyph& glyph) {
pathData->fIntercept = nullptr; pathData->fIntercept = nullptr;
SkPath* path = new SkPath; SkPath* path = new SkPath;
if (fScalerContext->getPath(glyph.getPackedID(), path)) { if (fScalerContext->getPath(glyph.getPackedID(), path)) {
path->updateBoundsCache();
path->getGenerationID();
pathData->fPath = path; pathData->fPath = path;
fMemoryUsed += compute_path_size(*path); fMemoryUsed += compute_path_size(*path);
} else { } else {

8
src/core/SkTypeface.cpp
View File

@ -29,8 +29,6 @@ extern void WhitelistSerializeTypeface(const SkTypeface*, SkWStream* );
#define SK_TYPEFACE_DELEGATE nullptr #define SK_TYPEFACE_DELEGATE nullptr
#endif #endif
sk_sp<SkTypeface> (*gCreateTypefaceDelegate)(const char[], SkFontStyle) = nullptr;
void (*gSerializeTypefaceDelegate)(const SkTypeface*, SkWStream* ) = SK_TYPEFACE_DELEGATE; void (*gSerializeTypefaceDelegate)(const SkTypeface*, SkWStream* ) = SK_TYPEFACE_DELEGATE;
sk_sp<SkTypeface> (*gDeserializeTypefaceDelegate)(SkStream* ) = nullptr; sk_sp<SkTypeface> (*gDeserializeTypefaceDelegate)(SkStream* ) = nullptr;
@ -129,12 +127,6 @@ bool SkTypeface::Equal(const SkTypeface* facea, const SkTypeface* faceb) {
sk_sp<SkTypeface> SkTypeface::MakeFromName(const char name[], sk_sp<SkTypeface> SkTypeface::MakeFromName(const char name[],
SkFontStyle fontStyle) { SkFontStyle fontStyle) {
if (gCreateTypefaceDelegate) {
sk_sp<SkTypeface> result = (*gCreateTypefaceDelegate)(name, fontStyle);
if (result) {
return result;
}
}
if (nullptr == name && (fontStyle.slant() == SkFontStyle::kItalic_Slant || if (nullptr == name && (fontStyle.slant() == SkFontStyle::kItalic_Slant ||
fontStyle.slant() == SkFontStyle::kUpright_Slant) && fontStyle.slant() == SkFontStyle::kUpright_Slant) &&
(fontStyle.weight() == SkFontStyle::kBold_Weight || (fontStyle.weight() == SkFontStyle::kBold_Weight ||