From 6bc96265306668af2daff7fea409fe24bd21d98d Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Mon, 4 Oct 2021 11:05:50 -0400 Subject: [PATCH] fix deadlock in remote cache logging In the stack trace in the bug, #16 findOrCreateStrike() grabs the lock, and then #8 Dump() makes calls that grab the lock. This is only a problem with debug code. Bug: chromium:1255085 Change-Id: Idcaad8bf2e8c2823bec899ee2b96a74ae666c164 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/455501 Commit-Queue: Herb Derby Reviewed-by: Ben Wagner --- src/core/SkTypeface_remote.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/SkTypeface_remote.cpp b/src/core/SkTypeface_remote.cpp index 725f611eaa00..954a24f68add 100644 --- a/src/core/SkTypeface_remote.cpp +++ b/src/core/SkTypeface_remote.cpp @@ -63,7 +63,6 @@ void SkScalerContextProxy::generateFontMetrics(SkFontMetrics* metrics) { "skia", "generateFontMetrics", "rec", TRACE_STR_COPY(this->getRec().dump().c_str())); if (this->getProxyTypeface()->isLogging()) { SkDebugf("GlyphCacheMiss generateFontMetrics: %s\n", this->getRec().dump().c_str()); - SkDEBUGCODE(SkStrikeCache::Dump()); } // Font metrics aren't really used for render, so just zero out the data and return.