diff options
author | Khushal <khushalsagar@chromium.org> | 2018-06-13 09:44:23 -0700 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-13 17:10:56 +0000 |
commit | 4010c792c6bd0378087225ae16b0131bd2c303f2 (patch) | |
tree | 0f09301a1539664603f285ad991e677abda04ebc /tests/SkRemoteGlyphCacheTest.cpp | |
parent | c6530d1e5ecce640e0255d66a01f9db73add7df9 (diff) |
fonts: Ignore re-initialization of fallback glyphs from the server.
If the client finds that the server re-initializes a cached path/image,
we consider this an error and invalid data. But since we might
initialize a glyph using a fallback on the client, and receive the
correct version from the server later, this is not longer true.
Bug: 829622
Change-Id: I34ab17b54139d89a15179265d4aed4a1fe36fd47
Reviewed-on: https://skia-review.googlesource.com/133566
Commit-Queue: Khusal Sagar <khushalsagar@chromium.org>
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'tests/SkRemoteGlyphCacheTest.cpp')
-rw-r--r-- | tests/SkRemoteGlyphCacheTest.cpp | 101 |
1 files changed, 101 insertions, 0 deletions
diff --git a/tests/SkRemoteGlyphCacheTest.cpp b/tests/SkRemoteGlyphCacheTest.cpp index 62036d2285..8bdfb7af69 100644 --- a/tests/SkRemoteGlyphCacheTest.cpp +++ b/tests/SkRemoteGlyphCacheTest.cpp @@ -509,3 +509,104 @@ DEF_TEST(SkRemoteGlyphCache_SearchOfDesperation, reporter) { // Must unlock everything on termination, otherwise valgrind complains about memory leaks. discardableManager->unlockAndDeleteAll(); } + +DEF_TEST(SkRemoteGlyphCache_ReWriteGlyph, reporter) { + // Build proxy typeface on the client for initializing the cache. + sk_sp<DiscardableManager> discardableManager = sk_make_sp<DiscardableManager>(); + SkStrikeServer server(discardableManager.get()); + SkStrikeClient client(discardableManager, false); + + auto serverTf = SkTypeface::MakeFromName("monospace", SkFontStyle()); + auto tfData = server.serializeTypeface(serverTf.get()); + auto clientTf = client.deserializeTypeface(tfData->data(), tfData->size()); + REPORTER_ASSERT(reporter, clientTf); + + SkPaint paint; + paint.setAntiAlias(true); + paint.setColor(SK_ColorRED); + + auto lostGlyphID = SkPackedGlyphID(1, SK_FixedHalf, SK_FixedHalf); + const uint8_t glyphImage[] = {0xFF, 0xFF}; + uint32_t realMask; + uint32_t fakeMask; + + { + SkAutoDescriptor ad; + SkScalerContextRec rec; + SkScalerContextEffects effects; + SkScalerContextFlags flags = SkScalerContextFlags::kFakeGammaAndBoostContrast; + paint.setTypeface(serverTf); + SkScalerContext::MakeRecAndEffects(paint, nullptr, nullptr, flags, &rec, &effects, false); + auto desc = SkScalerContext::AutoDescriptorGivenRecAndEffects(rec, effects, &ad); + + auto context = serverTf->createScalerContext(effects, desc, false); + SkGlyph glyph; + glyph.initWithGlyphID(lostGlyphID); + context->getMetrics(&glyph); + realMask = glyph.fMaskFormat; + REPORTER_ASSERT(reporter, realMask != MASK_FORMAT_UNKNOWN); + } + + // Build a fallback cache. + { + SkAutoDescriptor ad; + SkScalerContextRec rec; + SkScalerContextEffects effects; + SkScalerContextFlags flags = SkScalerContextFlags::kFakeGammaAndBoostContrast; + paint.setTypeface(clientTf); + SkScalerContext::MakeRecAndEffects(paint, nullptr, nullptr, flags, &rec, &effects, false); + auto desc = SkScalerContext::AutoDescriptorGivenRecAndEffects(rec, effects, &ad); + + auto fallbackCache = SkStrikeCache::FindOrCreateStrikeExclusive(*desc, effects, *clientTf); + auto glyph = fallbackCache->getRawGlyphByID(lostGlyphID); + fakeMask = (realMask == SkMask::kA8_Format) ? SkMask::kBW_Format : SkMask::kA8_Format; + glyph->fMaskFormat = fakeMask; + glyph->fHeight = 1; + glyph->fWidth = 2; + fallbackCache->initializeImage(glyphImage, glyph->computeImageSize(), glyph); + } + + // Send over the real glyph and make sure the client cache stays intact. + { + SkAutoDescriptor ad; + SkScalerContextRec rec; + SkScalerContextEffects effects; + SkScalerContextFlags flags = SkScalerContextFlags::kFakeGammaAndBoostContrast; + paint.setTypeface(serverTf); + auto* cacheState = server.getOrCreateCache(paint, nullptr, nullptr, flags, &rec, &effects); + cacheState->addGlyph(serverTf.get(), effects, lostGlyphID, false); + + std::vector<uint8_t> serverStrikeData; + server.writeStrikeData(&serverStrikeData); + REPORTER_ASSERT(reporter, + client.readStrikeData(serverStrikeData.data(), serverStrikeData.size())); + } + + { + SkAutoDescriptor ad; + SkScalerContextRec rec; + SkScalerContextEffects effects; + SkScalerContextFlags flags = SkScalerContextFlags::kFakeGammaAndBoostContrast; + paint.setTypeface(clientTf); + SkScalerContext::MakeRecAndEffects(paint, nullptr, nullptr, flags, &rec, &effects, false); + auto desc = SkScalerContext::AutoDescriptorGivenRecAndEffects(rec, effects, &ad); + + auto fallbackCache = SkStrikeCache::FindStrikeExclusive(*desc); + REPORTER_ASSERT(reporter, fallbackCache.get() != nullptr); + auto glyph = fallbackCache->getRawGlyphByID(lostGlyphID); + REPORTER_ASSERT(reporter, glyph->fMaskFormat == fakeMask); + + // Try overriding the image, it should stay the same. + REPORTER_ASSERT(reporter, + memcmp(glyph->fImage, glyphImage, glyph->computeImageSize()) == 0); + const uint8_t newGlyphImage[] = {0, 0}; + fallbackCache->initializeImage(newGlyphImage, glyph->computeImageSize(), glyph); + REPORTER_ASSERT(reporter, + memcmp(glyph->fImage, glyphImage, glyph->computeImageSize()) == 0); + } + + SkStrikeCache::Validate(); + + // Must unlock everything on termination, otherwise valgrind complains about memory leaks. + discardableManager->unlockAndDeleteAll(); +} |