diff options
| author |  Herb Derby <herb@google.com> | 2018-04-18 10:50:40 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-18 15:30:02 +0000 |
| commit | ff77aefc2e0bda10d5e42dc3218e0c5d2b890f73 (patch) | |
| tree | d03b9317b26e8fa06189af0c4e39daa765ff08f7 /src/core | |
| parent | 993ab45a5e0952340128568c14444d2697ee4cdb (diff) | |
Simplify strike cache Node
Change-Id: Ia7d65d84ad0ebe2a62fbd98629c7c37273a6167a
Reviewed-on: https://skia-review.googlesource.com/121980
Auto-Submit: Herb Derby <herb@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkGlyphCache.h | 2 | ||||
| -rw-r--r-- | src/core/SkStrikeCache.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/SkGlyphCache.h b/src/core/SkGlyphCache.h index 7d31bf9181..ca6ae8fb09 100644 --- a/src/core/SkGlyphCache.h +++ b/src/core/SkGlyphCache.h @@ -32,7 +32,7 @@ class SkTraceMemoryDump; The Find*Exclusive() method returns SkExclusiveStrikePtr, which releases exclusive ownership when they go out of scope. */ -class SkGlyphCache : private SkStrikeCache::Node<SkGlyphCache> { +class SkGlyphCache : private SkStrikeCache::Node { public: /** Return true if glyph is cached. */ bool isGlyphCached(SkGlyphID glyphID, SkFixed x, SkFixed y) const; diff --git a/src/core/SkStrikeCache.h b/src/core/SkStrikeCache.h index 6d5dd3b7bd..078adfe9de 100644 --- a/src/core/SkStrikeCache.h +++ b/src/core/SkStrikeCache.h @@ -87,12 +87,11 @@ public: private: friend class SkGlyphCache; - template <typename T> struct Node { Node(const SkDescriptor& desc) : fDesc{desc} {} const SkDescriptor& getDescriptor() const {return *fDesc.getDesc(); } - T* fNext{nullptr}; - T* fPrev{nullptr}; + SkGlyphCache* fNext{nullptr}; + SkGlyphCache* fPrev{nullptr}; SkAutoDescriptor fDesc; }; |