diff options
author | 2018-05-02 10:29:37 -0700 | |
---|---|---|
committer | 2018-05-02 18:39:31 +0000 | |
commit | 38a08436886e82de4eb9ebdbcb2bbd5ea7b05c6d (patch) | |
tree | 3477528878c8d4b0a053fbc807efd02e60fcde14 /src/core/SkTypeface_remote.cpp | |
parent | 81afc04b5368fc4a7cb6ae4b4d7069e67a3a51f8 (diff) |
fonts: Reland push font remoting.
This relands the following changes:
1) https://skia-review.googlesource.com/c/skia/+/120283
2) https://skia-review.googlesource.com/c/skia/+/125029
3) https://skia-review.googlesource.com/c/skia/+/125140
The original changes had to be reverted due to a memory leak in
SkBaseDevice from SkTextBlobCacheDiffCanvas. This has been addressed by
https://skia-review.googlesource.com/c/skia/+/125160
TBR=herb@google.com
Bug: skia:7515, 831354
Change-Id: I73f4fcb1c397f31bf01553ff48c71ed2d6dd0770
Reviewed-on: https://skia-review.googlesource.com/125326
Commit-Queue: Khusal Sagar <khushalsagar@chromium.org>
Reviewed-by: Khusal Sagar <khushalsagar@chromium.org>
Diffstat (limited to 'src/core/SkTypeface_remote.cpp')
-rw-r--r-- | src/core/SkTypeface_remote.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/core/SkTypeface_remote.cpp b/src/core/SkTypeface_remote.cpp index bc0d04bc2a..3b58af9366 100644 --- a/src/core/SkTypeface_remote.cpp +++ b/src/core/SkTypeface_remote.cpp @@ -6,17 +6,15 @@ */ #include "SkTypeface_remote.h" +#include "SkRemoteGlyphCache.h" #include "SkPaint.h" -#include "SkRemoteGlyphCache.h" -SkScalerContextProxy::SkScalerContextProxy( - sk_sp<SkTypeface> tf, - const SkScalerContextEffects& effects, - const SkDescriptor* desc, - SkStrikeClient* rsc) - : SkScalerContext{std::move(tf), effects, desc} - , fClient{rsc} {} +SkScalerContextProxy::SkScalerContextProxy(sk_sp<SkTypeface> tf, + const SkScalerContextEffects& effects, + const SkDescriptor* desc, + SkStrikeClient* rsc) + : SkScalerContext{std::move(tf), effects, desc}, fClient{rsc} {} unsigned SkScalerContextProxy::generateGlyphCount() { SK_ABORT("Should never be called."); @@ -40,7 +38,8 @@ void SkScalerContextProxy::generateImage(const SkGlyph& glyph) { } bool SkScalerContextProxy::generatePath(SkGlyphID glyphID, SkPath* path) { - return fClient->generatePath(*this->typefaceProxy(), this->getRec(), glyphID, path); + fClient->generatePath(*this->typefaceProxy(), this->getRec(), glyphID, path); + return true; } void SkScalerContextProxy::generateFontMetrics(SkPaint::FontMetrics* metrics) { |