From 2b0e6cd4d9b163fe61b3670127f5dc7cb7297f68 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Mon, 9 Jul 2018 12:43:39 -0400 Subject: Reland "SkDEBUGF: use __VA_ARGS__" This is a reland of 2267a092356d17f6444502dc92491485ccf24341 Original change's description: > SkDEBUGF: use __VA_ARGS__ > > Change-Id: I42a47e821ff7a7f6cec65b38a8216cabbf0acfce > Reviewed-on: https://skia-review.googlesource.com/139860 > Reviewed-by: Mike Klein > Commit-Queue: Hal Canary Change-Id: Ia06567e441a414f4dcdbe5663160082f889f9fef Reviewed-on: https://skia-review.googlesource.com/141762 Reviewed-by: Hal Canary Commit-Queue: Hal Canary --- src/ports/SkFontHost_FreeType.cpp | 62 ++++++++++++++++---------------- src/ports/SkFontHost_FreeType_common.cpp | 4 +-- src/ports/SkFontMgr_android.cpp | 18 +++++----- src/ports/SkOSFile_stdio.cpp | 4 +-- src/ports/SkTypeface_win_dw.cpp | 4 +-- 5 files changed, 46 insertions(+), 46 deletions(-) (limited to 'src/ports') diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 03f499fcf6..09b9c4e9e6 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -327,15 +327,15 @@ static void ft_face_setup_axes(SkFaceRec* rec, const SkFontData& data) { SkDEBUGCODE( FT_MM_Var* variations = nullptr; if (FT_Get_MM_Var(rec->fFace.get(), &variations)) { - SkDEBUGF(("INFO: font %s claims variations, but none found.\n", - rec->fFace->family_name)); + SkDEBUGF("INFO: font %s claims variations, but none found.\n", + rec->fFace->family_name); return; } SkAutoFree autoFreeVariations(variations); if (static_cast(data.getAxisCount()) != variations->num_axis) { - SkDEBUGF(("INFO: font %s has %d variations, but %d were specified.\n", - rec->fFace->family_name, variations->num_axis, data.getAxisCount())); + SkDEBUGF("INFO: font %s has %d variations, but %d were specified.\n", + rec->fFace->family_name, variations->num_axis, data.getAxisCount()); return; } ) @@ -345,8 +345,8 @@ static void ft_face_setup_axes(SkFaceRec* rec, const SkFontData& data) { coords[i] = data.getAxis()[i]; } if (FT_Set_Var_Design_Coordinates(rec->fFace.get(), data.getAxisCount(), coords.get())) { - SkDEBUGF(("INFO: font %s has variations, but specified variations could not be set.\n", - rec->fFace->family_name)); + SkDEBUGF("INFO: font %s has variations, but specified variations could not be set.\n", + rec->fFace->family_name); return; } @@ -764,7 +764,7 @@ bool SkTypeface_FreeType::onGetKerningPairAdjustments(const uint16_t glyphs[], /** Returns the bitmap strike equal to or just larger than the requested size. */ static FT_Int chooseBitmapStrike(FT_Face face, FT_F26Dot6 scaleY) { if (face == nullptr) { - SkDEBUGF(("chooseBitmapStrike aborted due to nullptr face.\n")); + SkDEBUGF("chooseBitmapStrike aborted due to nullptr face.\n"); return -1; } @@ -808,7 +808,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp typeface, // load the font file if (nullptr == fFaceRec) { - SkDEBUGF(("Could not create FT_Face.\n")); + SkDEBUGF("Could not create FT_Face.\n"); return; } @@ -892,7 +892,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp typeface, return size; }()); if (nullptr == ftSize) { - SkDEBUGF(("Could not create FT_Size.\n")); + SkDEBUGF("Could not create FT_Size.\n"); return; } @@ -930,8 +930,8 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp typeface, } else if (FT_HAS_FIXED_SIZES(fFaceRec->fFace)) { fStrikeIndex = chooseBitmapStrike(fFaceRec->fFace.get(), scaleY); if (fStrikeIndex == -1) { - SkDEBUGF(("No glyphs for font \"%s\" size %f.\n", - fFaceRec->fFace->family_name, fScale.fY)); + SkDEBUGF("No glyphs for font \"%s\" size %f.\n", + fFaceRec->fFace->family_name, fScale.fY); return; } @@ -959,7 +959,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp typeface, // Force this flag off for bitmap only fonts. fLoadGlyphFlags &= ~FT_LOAD_NO_BITMAP; } else { - SkDEBUGF(("Unknown kind of font \"%s\" size %f.\n", fFaceRec->fFace->family_name, fScale.fY)); + SkDEBUGF("Unknown kind of font \"%s\" size %f.\n", fFaceRec->fFace->family_name, fScale.fY); return; } @@ -1231,7 +1231,7 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph) { } #ifdef ENABLE_GLYPH_SPEW - SkDEBUGF(("Metrics(glyph:%d flags:0x%x) w:%d\n", glyph->getGlyphID(), fLoadGlyphFlags, glyph->fWidth)); + SkDEBUGF("Metrics(glyph:%d flags:0x%x) w:%d\n", glyph->getGlyphID(), fLoadGlyphFlags, glyph->fWidth); #endif } @@ -1847,7 +1847,7 @@ bool SkTypeface_FreeType::Scanner::scanFont( if (index >= 0) { weight = commonWeights[index].weight; } else { - SkDEBUGF(("Do not know weight for: %s (%s) \n", face->family_name, psFontInfo.weight)); + SkDEBUGF("Do not know weight for: %s (%s) \n", face->family_name, psFontInfo.weight); } } @@ -1871,8 +1871,8 @@ bool SkTypeface_FreeType::Scanner::GetAxes(FT_Face face, AxisDefinitions* axes) FT_MM_Var* variations = nullptr; FT_Error err = FT_Get_MM_Var(face, &variations); if (err) { - SkDEBUGF(("INFO: font %s claims to have variations, but none found.\n", - face->family_name)); + SkDEBUGF("INFO: font %s claims to have variations, but none found.\n", + face->family_name); return false; } SkAutoFree autoFreeVariations(variations); @@ -1907,15 +1907,15 @@ bool SkTypeface_FreeType::Scanner::GetAxes(FT_Face face, AxisDefinitions* axes) if (axisDefinition.fTag == coordinate.axis) { const SkScalar axisValue = SkTPin(coordinate.value, axisMin, axisMax); if (coordinate.value != axisValue) { - SkDEBUGF(("Requested font axis value out of range: " - "%s '%c%c%c%c' %f; pinned to %f.\n", - name.c_str(), - (axisDefinition.fTag >> 24) & 0xFF, - (axisDefinition.fTag >> 16) & 0xFF, - (axisDefinition.fTag >> 8) & 0xFF, - (axisDefinition.fTag ) & 0xFF, - SkScalarToDouble(coordinate.value), - SkScalarToDouble(axisValue))); + SkDEBUGF("Requested font axis value out of range: " + "%s '%c%c%c%c' %f; pinned to %f.\n", + name.c_str(), + (axisDefinition.fTag >> 24) & 0xFF, + (axisDefinition.fTag >> 16) & 0xFF, + (axisDefinition.fTag >> 8) & 0xFF, + (axisDefinition.fTag ) & 0xFF, + SkScalarToDouble(coordinate.value), + SkScalarToDouble(axisValue)); } axisValues[i] = SkScalarToFixed(axisValue); break; @@ -1936,12 +1936,12 @@ bool SkTypeface_FreeType::Scanner::GetAxes(FT_Face face, AxisDefinitions* axes) } } if (!found) { - SkDEBUGF(("Requested font axis not found: %s '%c%c%c%c'\n", - name.c_str(), - (skTag >> 24) & 0xFF, - (skTag >> 16) & 0xFF, - (skTag >> 8) & 0xFF, - (skTag) & 0xFF)); + SkDEBUGF("Requested font axis not found: %s '%c%c%c%c'\n", + name.c_str(), + (skTag >> 24) & 0xFF, + (skTag >> 16) & 0xFF, + (skTag >> 8) & 0xFF, + (skTag) & 0xFF); } } ) diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp index bd15834775..af2e442365 100644 --- a/src/ports/SkFontHost_FreeType_common.cpp +++ b/src/ports/SkFontHost_FreeType_common.cpp @@ -176,7 +176,7 @@ void copyFT2LCD16(const FT_Bitmap& bitmap, const SkMask& mask, int lcdIsBGR, } break; default: - SkDEBUGF(("FT_Pixel_Mode %d", bitmap.pixel_mode)); + SkDEBUGF("FT_Pixel_Mode %d", bitmap.pixel_mode); SkDEBUGFAIL("unsupported FT_Pixel_Mode for LCD16"); break; } @@ -276,7 +276,7 @@ void copyFTBitmap(const FT_Bitmap& srcFTBitmap, SkMask& dstMask) { dst += dstRowBytes; } } else { - SkDEBUGF(("FT_Pixel_Mode %d, SkMask::Format %d\n", srcFormat, dstFormat)); + SkDEBUGF("FT_Pixel_Mode %d, SkMask::Format %d\n", srcFormat, dstFormat); SkDEBUGFAIL("unsupported combination of FT_Pixel_Mode and SkMask::Format"); } } diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp index a7cbd97d26..feb22c8262 100644 --- a/src/ports/SkFontMgr_android.cpp +++ b/src/ports/SkFontMgr_android.cpp @@ -187,8 +187,8 @@ public: std::unique_ptr stream = SkStream::MakeFromFile(pathName.c_str()); if (!stream) { - SkDEBUGF(("Requested font file %s does not exist or cannot be opened.\n", - pathName.c_str())); + SkDEBUGF("Requested font file %s does not exist or cannot be opened.\n", + pathName.c_str()); continue; } @@ -200,8 +200,8 @@ public: if (!scanner.scanFont(stream.get(), ttcIndex, &familyName, &style, &isFixedWidth, &axisDefinitions)) { - SkDEBUGF(("Requested font file %s exists, but is not a valid font.\n", - pathName.c_str())); + SkDEBUGF("Requested font file %s exists, but is not a valid font.\n", + pathName.c_str()); continue; } @@ -577,11 +577,11 @@ sk_sp SkFontMgr_New_Android(const SkFontMgr_Android_CustomFonts* cust if (custom) { SkASSERT(0 <= custom->fSystemFontUse); SkASSERT(custom->fSystemFontUse < SK_ARRAY_COUNT(gSystemFontUseStrings)); - SkDEBUGF(("SystemFontUse: %s BasePath: %s Fonts: %s FallbackFonts: %s\n", - gSystemFontUseStrings[custom->fSystemFontUse], - custom->fBasePath, - custom->fFontsXml, - custom->fFallbackFontsXml)); + SkDEBUGF("SystemFontUse: %s BasePath: %s Fonts: %s FallbackFonts: %s\n", + gSystemFontUseStrings[custom->fSystemFontUse], + custom->fBasePath, + custom->fFontsXml, + custom->fFallbackFontsXml); } return sk_make_sp(custom); } diff --git a/src/ports/SkOSFile_stdio.cpp b/src/ports/SkOSFile_stdio.cpp index d8541c21c0..10ba7c8b0c 100644 --- a/src/ports/SkOSFile_stdio.cpp +++ b/src/ports/SkOSFile_stdio.cpp @@ -93,8 +93,8 @@ FILE* sk_fopen(const char path[], SkFILE_Flags flags) { #endif if (nullptr == file && (flags & kWrite_SkFILE_Flag)) { - SkDEBUGF(("sk_fopen: fopen(\"%s\", \"%s\") returned nullptr (errno:%d): %s\n", - path, perm, errno, strerror(errno))); + SkDEBUGF("sk_fopen: fopen(\"%s\", \"%s\") returned nullptr (errno:%d): %s\n", + path, perm, errno, strerror(errno)); } return file; } diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp index 3bf61347df..b419ae985f 100644 --- a/src/ports/SkTypeface_win_dw.cpp +++ b/src/ports/SkTypeface_win_dw.cpp @@ -484,7 +484,7 @@ std::unique_ptr DWriteFontTypeface::onGetAdvancedMetr !exists || FAILED(sk_get_locale_string(postScriptNames.get(), nullptr, &info->fPostScriptName))) { - SkDEBUGF(("Unable to get postscript name for typeface %p\n", this)); + SkDEBUGF("Unable to get postscript name for typeface %p\n", this); } } @@ -493,7 +493,7 @@ std::unique_ptr DWriteFontTypeface::onGetAdvancedMetr if (FAILED(fDWriteFontFamily->GetFamilyNames(&familyNames)) || FAILED(sk_get_locale_string(familyNames.get(), nullptr, &info->fFontName))) { - SkDEBUGF(("Unable to get family name for typeface 0x%p\n", this)); + SkDEBUGF("Unable to get family name for typeface 0x%p\n", this); } if (info->fPostScriptName.isEmpty()) { info->fPostScriptName = info->fFontName; -- cgit v1.2.3