diff options
author | Mike Klein <mtklein@google.com> | 2018-05-23 00:15:37 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-23 00:17:16 +0000 |
commit | 7257e22e43a56a5f4f772b687034580061cd011f (patch) | |
tree | c7f8b54f2d35b3be50309f559ac886a0ec9ddb7a /src/core/SkRemoteGlyphCache.h | |
parent | fc6cf92e4b21c92ead769fae557534056eac6d83 (diff) |
Revert "fonts: Add support for distance field text to font remoting."
This reverts commit 35e0a1a6908492c754156d1abb785da3a9ce2a6b.
Reason for revert: looks like we're leaking paths?
https://chromium-swarm.appspot.com/task?id=3da25e2f0cadb210&refresh=10
Original change's description:
> fonts: Add support for distance field text to font remoting.
>
> R=jvanverth@google.com, herb@google.com
>
> Bug: skia:7913
> Change-Id: Id3f5b3e75005be9a7234df774268359b406c99a8
> Reviewed-on: https://skia-review.googlesource.com/128970
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Jim Van Verth <jvanverth@google.com>
> Commit-Queue: Khusal Sagar <khushalsagar@chromium.org>
TBR=jvanverth@google.com,bsalomon@google.com,bungeman@google.com,herb@google.com,khushalsagar@chromium.org
Change-Id: I37c54c8748db9b20e1f48016d8298808a1999fdb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7913
Reviewed-on: https://skia-review.googlesource.com/129681
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/core/SkRemoteGlyphCache.h')
-rw-r--r-- | src/core/SkRemoteGlyphCache.h | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/core/SkRemoteGlyphCache.h b/src/core/SkRemoteGlyphCache.h index d1119cf70a..60d880791f 100644 --- a/src/core/SkRemoteGlyphCache.h +++ b/src/core/SkRemoteGlyphCache.h @@ -28,7 +28,6 @@ class Serializer; class SkDescriptor; class SkGlyphCache; struct SkPackedGlyphID; -enum SkScalerContextFlags : uint32_t; class SkScalerContextRecDescriptor; class SkTextBlobRunIterator; class SkTypefaceProxy; @@ -52,17 +51,8 @@ using SkDescriptorSet = // which will be serialized and renderered using the SkStrikeClient. class SK_API SkTextBlobCacheDiffCanvas : public SkNoDrawCanvas { public: - struct SK_API Settings { - Settings(); - ~Settings(); - - bool fContextSupportsDistanceFieldText = true; - SkScalar fMinDistanceFieldFontSize = -1.f; - SkScalar fMaxDistanceFieldFontSize = -1.f; - }; SkTextBlobCacheDiffCanvas(int width, int height, const SkMatrix& deviceMatrix, - const SkSurfaceProps& props, SkStrikeServer* strikeserver, - Settings settings = Settings()); + const SkSurfaceProps& props, SkStrikeServer* strikeserver); ~SkTextBlobCacheDiffCanvas() override; protected: @@ -80,13 +70,10 @@ private: const SkTextBlobRunIterator& it, const SkPaint& runPaint); void processGlyphRunForPaths(const SkTextBlobRunIterator& it, const SkPaint& runPaint); - void processGlyphRunForDFT(const SkTextBlobRunIterator& it, const SkPaint& runPaint, - SkScalerContextFlags flags); const SkMatrix fDeviceMatrix; const SkSurfaceProps fSurfaceProps; SkStrikeServer* const fStrikeServer; - const Settings fSettings; }; using SkDiscardableHandleId = uint32_t; @@ -174,7 +161,7 @@ public: }; SkGlyphCacheState* getOrCreateCache(const SkPaint&, const SkSurfaceProps*, const SkMatrix*, - SkScalerContextFlags flags, SkScalerContextRec* deviceRec, + SkScalerContextRec* deviceRec, SkScalerContextEffects* effects); private: |