diff options
| author | Herb Derby <herb@google.com> | 2019-01-22 14:45:16 -0500 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2019-01-23 18:52:09 +0000 |
| commit | 087fad7900d21ac938b7628051fcd48e2b4f538b (patch) | |
| tree | 02f22f29711c8b2f3f77538994c9040c5409c9d3 /tools | |
| parent | 08b0b7fd5bd5c2b6ab746246167b1f0f446c9830 (diff) | |
| download | skqp-087fad7900d21ac938b7628051fcd48e2b4f538b.tar.gz | |
Add getTypefaceOrDefault and refTypefaceOrDefault
* Remove GetTypefaceOrDefault from SkPaint and SkFont
* Remove RefTypefaceOrDefault from SkPaint and SkFont
Change-Id: I04ae777142c2bdec849508b611b844418bbaedff
Reviewed-on: https://skia-review.googlesource.com/c/185781
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/debugger/SkDrawCommand.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp index 3726d75487..2be535dbc3 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp @@ -980,7 +980,7 @@ static void apply_paint_patheffect(const SkPaint& paint, Json::Value* target, static void apply_font_typeface(const SkFont& font, Json::Value* target, UrlDataManager& urlDataManager) { - SkTypeface* typeface = font.getTypeface(); + SkTypeface* typeface = font.getTypefaceOrDefault(); if (typeface != nullptr) { Json::Value jsonTypeface; SkDynamicMemoryWStream buffer; |