diff options
author | Herb Derby <herb@google.com> | 2018-06-21 15:15:50 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-21 19:49:27 +0000 |
commit | 5c0c7983bb6371c493561dbc97671e4997f822d5 (patch) | |
tree | e8bf690e86f2fb4ed0c55bbf5db929dee2a947ab /src/core/SkRemoteGlyphCache.h | |
parent | c113e9e23d76a463743d6e5372284fb84b58fd8c (diff) |
Use local strike caches to avoid flaky test behavior
The remote glyph cache tests assume that the strike cache will not
change during a test. This is not true because other test also
mutate the strike cache. This is causing flaky tests.
BUG=skia:8091
Change-Id: I397d411f9412006715f6860941dfb05ad54ae1b6
Reviewed-on: https://skia-review.googlesource.com/136741
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'src/core/SkRemoteGlyphCache.h')
-rw-r--r-- | src/core/SkRemoteGlyphCache.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/SkRemoteGlyphCache.h b/src/core/SkRemoteGlyphCache.h index ac13920772..157e058331 100644 --- a/src/core/SkRemoteGlyphCache.h +++ b/src/core/SkRemoteGlyphCache.h @@ -20,7 +20,6 @@ #include "SkMakeUnique.h" #include "SkNoDrawCanvas.h" #include "SkRefCnt.h" -#include "SkRemoteGlyphCache.h" #include "SkSerialProcs.h" #include "SkTypeface.h" @@ -30,6 +29,7 @@ class SkGlyphCache; struct SkPackedGlyphID; enum SkScalerContextFlags : uint32_t; class SkScalerContextRecDescriptor; +class SkStrikeCache; class SkTextBlobRunIterator; class SkTypefaceProxy; struct WireTypeface; @@ -212,7 +212,9 @@ public: virtual void notifyCacheMiss(CacheMissType) {} }; - SkStrikeClient(sk_sp<DiscardableHandleManager>, bool isLogging = true); + SkStrikeClient(sk_sp<DiscardableHandleManager>, + bool isLogging = true, + SkStrikeCache* strikeCache = nullptr); ~SkStrikeClient(); // Deserializes the typeface previously serialized using the SkStrikeServer. Returns null if the @@ -232,6 +234,7 @@ private: SkTHashMap<SkFontID, sk_sp<SkTypeface>> fRemoteFontIdToTypeface; sk_sp<DiscardableHandleManager> fDiscardableHandleManager; + SkStrikeCache* const fStrikeCache; const bool fIsLogging; }; |