diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 29af01e93938b31a9a40a8716c61ac78d4d2afcd..cdea5ad5a824d05b4223572b458f4dba7658b4b4 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -2382,8 +2382,7 @@ void SkCanvas::onDrawGlyphRunList(const sktext::GlyphRunList& glyphRunList, cons #if (defined(SK_GANESH) || defined(SK_GRAPHITE)) sk_sp SkCanvas::convertBlobToSlug( const SkTextBlob& blob, SkPoint origin, const SkPaint& paint) { -#if defined(IS_OHOS) -#else +#if !defined(SK_BUILD_FOR_OHOS) TRACE_EVENT0("skia", TRACE_FUNC); #endif auto glyphRunList = fScratchGlyphRunBuilder->blobToGlyphRunList(blob, origin); @@ -2502,8 +2501,7 @@ bool gSkBlobAsSlugTesting = false; void SkCanvas::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, const SkPaint& paint) { -#if defined(IS_OHOS) -#else +#if !defined(SK_BUILD_FOR_OHOS) TRACE_EVENT0("skia", TRACE_FUNC); #endif RETURN_ON_NULL(blob); diff --git a/src/core/SkChromeRemoteGlyphCache.cpp b/src/core/SkChromeRemoteGlyphCache.cpp index 1117c012209ebafe9ba67c747282985d6a219859..99db23922b5b3f1e63b326141c8a18f21b46c01d 100644 --- a/src/core/SkChromeRemoteGlyphCache.cpp +++ b/src/core/SkChromeRemoteGlyphCache.cpp @@ -665,8 +665,7 @@ void SkStrikeServerImpl::checkForDeletedEntries() { sk_sp SkStrikeServerImpl::getOrCreateCache(const SkStrikeSpec& strikeSpec) { // In cases where tracing is turned off, make sure not to get an unused function warning. // Lambdaize the function. -#if defined(IS_OHOS) -#else +#if !defined(SK_BUILD_FOR_OHOS) TRACE_EVENT1("skia", "RecForDesc", "rec", TRACE_STR_COPY( [&strikeSpec](){