diff options
author | Kevin Lubick <kjlubick@google.com> | 2018-06-22 21:07:27 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-22 21:07:38 +0000 |
commit | cce82d2b7c6ce3addd72016191e1be73bc084953 (patch) | |
tree | 630629a78212bdabb016b904ff9b727dc48ca286 /src/ports | |
parent | 98a8fc4bab86b57a4a1518cfa40fa21fc102aa86 (diff) |
Revert "Implement onMakeClone(const SkFontArguments& args) in class SkTypeface_fontconfig."
This reverts commit 96b1ecc25d00a3d52dcc51a788b0df0acdd1dad9.
Reason for revert: Breaking Google3, I think
Original change's description:
> Implement onMakeClone(const SkFontArguments& args) in class SkTypeface_fontconfig.
>
> Create FontMgrFontConfigTest.cpp file to test the above function.
>
> Change-Id: I7716355f702af3d6f25574305914f0b82a4147ce
> Reviewed-on: https://skia-review.googlesource.com/137133
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Ben Wagner <bungeman@google.com>
TBR=bungeman@google.com,herb@google.com,brucewang@google.com
Change-Id: I665de46d379f1b533358f0be644814aa4bfffb33
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/137240
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'src/ports')
-rw-r--r-- | src/ports/SkFontMgr_fontconfig.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp index e5aed18c60..3589ae8100 100644 --- a/src/ports/SkFontMgr_fontconfig.cpp +++ b/src/ports/SkFontMgr_fontconfig.cpp @@ -525,21 +525,6 @@ public: return info; } - sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override { - std::unique_ptr<SkFontData> data = this->cloneFontData(args); - if (!data) { - return nullptr; - } - - SkString fFamilyName; - this->getFamilyName(&fFamilyName); - - return sk_make_sp<SkTypeface_stream>(std::move(data), - fFamilyName, - this->fontStyle(), - this->isFixedPitch()); - } - ~SkTypeface_fontconfig() override { // Hold the lock while unrefing the pattern. FCLocker lock; |