aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Adrienne Walker <enne@chromium.org>2018-06-29 10:47:40 -0700
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-29 18:14:17 +0000
commit6dcd716293dd41cb1e8215fb1060ed548614aefc (patch)
treeb161e89be1308eb01b15d0b60d226d021a2d875c
parent26bb0e66f28c41cb1e8e39f00d848997fd33d97c (diff)
Fix chrome memory dump crashes using out of process strike caches
When using out of process raster in Chrome, it uses SkTypefaceProxy in the gpu process. When SkStrikeCache::DumpMemoryStatistics, this asserts on getFamilyName. Stub this function out to fix the issue. Punt for now on forwarding real family names to SkTypefaceProxy until somebody complains about it. Change-Id: Idbd870c4990e5725a97cfe3501f3943f8a83dea2 Reviewed-on: https://skia-review.googlesource.com/138602 Commit-Queue: Adrienne Walker <enne@chromium.org> Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
-rw-r--r--src/core/SkTypeface_remote.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/SkTypeface_remote.h b/src/core/SkTypeface_remote.h
index 47a68fd08d..1b4ad89025 100644
--- a/src/core/SkTypeface_remote.h
+++ b/src/core/SkTypeface_remote.h
@@ -83,7 +83,8 @@ protected:
return 0;
}
void onGetFamilyName(SkString* familyName) const override {
- SK_ABORT("Should never be called.");
+ // Used by SkStrikeCache::DumpMemoryStatistics.
+ *familyName = "";
}
SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override {
SK_ABORT("Should never be called.");