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 <herb@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
This commit is contained in:
Herb Derby 2021-10-04 11:05:50 -04:00 committed by SkCQ
parent b37fe549b2
commit 6bc9626530

View File

@ -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.