AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Compare pixels for TypefaceWithNoPaths test"

Browse Source 
This reverts commit 405735228f.

Reason for revert: failing on android bots

Original change's description:
> Compare pixels for TypefaceWithNoPaths test
> 
> Change-Id: I786b741462ca2b68b43e5f3443671c4a7e2f801f
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/216614
> Reviewed-by: Khushal Sagar <khushalsagar@chromium.org>
> Commit-Queue: Herb Derby <herb@google.com>

TBR=herb@google.com,khushalsagar@chromium.org

Change-Id: Ib958c1b6c8893e100743d827aa50d5273d2a4cd6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/216861
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2019-05-30 11:40:51 +00:00 committed by Skia Commit-Bot
parent 655ee0f015
commit 69aaee0ff9
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/SkRemoteGlyphCacheTest.cpp
View File

@ -781,17 +781,14 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_TypefaceWithNoPaths, repor
auto serverTf = ToolUtils::emoji_typeface();
auto serverTfData = server.serializeTypeface(serverTf.get());
auto clientTf = client.deserializeTypeface(serverTfData->data(), serverTfData->size());
constexpr int width = 500,
height = 500;
for (SkScalar textSize : { 70, 180, 270, 340 }) {
for (SkScalar textSize : { 70, 180, 270, 340}) {
auto serverBlob = MakeEmojiBlob(serverTf, textSize);
auto props = FindSurfaceProps(ctxInfo.grContext());
SkTextBlobCacheDiffCanvas cache_diff_canvas(500, 500, props, &server,
MakeSettings(ctxInfo.grContext()));
SkPaint paint;
// Draw on the diff canvas as the same place as RasterBlob.
cache_diff_canvas.drawTextBlob(serverBlob.get(), 0, height/2, paint);
cache_diff_canvas.drawTextBlob(serverBlob.get(), 100, 100, paint);
std::vector<uint8_t> serverStrikeData;
server.writeStrikeData(&serverStrikeData);
@ -801,14 +798,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_TypefaceWithNoPaths, repor
auto clientBlob = MakeEmojiBlob(serverTf, textSize, clientTf);
REPORTER_ASSERT(reporter, clientBlob);
SkBitmap expected = RasterBlob(
serverBlob, width, height, paint, ctxInfo.grContext());
SkBitmap actual = RasterBlob(
clientBlob, width, height, paint, ctxInfo.grContext());
// Be sloppy for paths.
compare_blobs(expected, actual, reporter, 1);
RasterBlob(clientBlob, 500, 500, paint, ctxInfo.grContext());
REPORTER_ASSERT(reporter, !discardableManager->hasCacheMiss());
SkStrikeCache::ValidateGlyphCacheDataSize();
discardableManager->resetCacheMissCounts();