From c113e9e23d76a463743d6e5372284fb84b58fd8c Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Thu, 21 Jun 2018 14:06:30 -0400 Subject: Make SkStrikeCache::Validate call non global version Change Validate to ValidateGlyphCacheDataSize. Make it call a non-global version. BUG=skia:8091 Change-Id: Iec31a06569a0ab1ec318e693e699a808eb9ad247 Reviewed-on: https://skia-review.googlesource.com/136638 Commit-Queue: Herb Derby Reviewed-by: Mike Klein --- tests/SkRemoteGlyphCacheTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests/SkRemoteGlyphCacheTest.cpp') diff --git a/tests/SkRemoteGlyphCacheTest.cpp b/tests/SkRemoteGlyphCacheTest.cpp index 8bdfb7af69..828ca031c0 100644 --- a/tests/SkRemoteGlyphCacheTest.cpp +++ b/tests/SkRemoteGlyphCacheTest.cpp @@ -287,7 +287,7 @@ DEF_TEST(SkRemoteGlyphCache_ClientMemoryAccounting, reporter) { // Client. REPORTER_ASSERT(reporter, client.readStrikeData(serverStrikeData.data(), serverStrikeData.size())); - SkStrikeCache::Validate(); + SkStrikeCache::ValidateGlyphCacheDataSize(); // Must unlock everything on termination, otherwise valgrind complains about memory leaks. discardableManager->unlockAndDeleteAll(); @@ -326,7 +326,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_DrawTextAsPath, reporter, SkBitmap actual = RasterBlob(clientBlob, 10, 10, paint, ctxInfo.grContext()); COMPARE_BLOBS(expected, actual, reporter); REPORTER_ASSERT(reporter, !discardableManager->hasCacheMiss()); - SkStrikeCache::Validate(); + SkStrikeCache::ValidateGlyphCacheDataSize(); // Must unlock everything on termination, otherwise valgrind complains about memory leaks. discardableManager->unlockAndDeleteAll(); @@ -373,7 +373,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_DrawTextAsDFT, reporter, c SkBitmap actual = RasterBlob(clientBlob, 10, 10, paint, ctxInfo.grContext(), &matrix); COMPARE_BLOBS(expected, actual, reporter); REPORTER_ASSERT(reporter, !discardableManager->hasCacheMiss()); - SkStrikeCache::Validate(); + SkStrikeCache::ValidateGlyphCacheDataSize(); // Must unlock everything on termination, otherwise valgrind complains about memory leaks. discardableManager->unlockAndDeleteAll(); @@ -504,7 +504,7 @@ DEF_TEST(SkRemoteGlyphCache_SearchOfDesperation, reporter) { REPORTER_ASSERT(reporter, discardableManager->cacheMissCount(i) == 0); } } - SkStrikeCache::Validate(); + SkStrikeCache::ValidateGlyphCacheDataSize(); // Must unlock everything on termination, otherwise valgrind complains about memory leaks. discardableManager->unlockAndDeleteAll(); @@ -605,7 +605,7 @@ DEF_TEST(SkRemoteGlyphCache_ReWriteGlyph, reporter) { memcmp(glyph->fImage, glyphImage, glyph->computeImageSize()) == 0); } - SkStrikeCache::Validate(); + SkStrikeCache::ValidateGlyphCacheDataSize(); // Must unlock everything on termination, otherwise valgrind complains about memory leaks. discardableManager->unlockAndDeleteAll(); -- cgit v1.2.3