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

Revert "SkDEBUGF: use __VA_ARGS__"

Browse Source 
This reverts commit 2267a09235.

Reason for revert: It looks like Google 3 is failing to compile w/ this CL

Original change's description:
> SkDEBUGF: use __VA_ARGS__
> 
> Change-Id: I42a47e821ff7a7f6cec65b38a8216cabbf0acfce
> Reviewed-on: https://skia-review.googlesource.com/139860
> Reviewed-by: Mike Klein <mtklein@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>

TBR=mtklein@google.com,halcanary@google.com,reed@google.com

Change-Id: I3aab490f3d2fea103fc915ca01cb0e294df86739
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/140660
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2018-07-11 16:45:06 +00:00 committed by Skia Commit-Bot
parent 23863179b1
commit e923cccb25
15 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzz/FuzzCanvas.cpp
View File

@ -904,7 +904,7 @@ static SkBitmap make_fuzz_bitmap(Fuzz* fuzz) {
fuzz->nextRange(&w, 1, 1024);
fuzz->nextRange(&h, 1, 1024);
if (!bitmap.tryAllocN32Pixels(w, h)) {
SkDEBUGF("Could not allocate pixels %d x %d", w, h);
SkDEBUGF(("Could not allocate pixels %d x %d", w, h));
return bitmap;
}
for (int y = 0; y < h; ++y) {

18
fuzz/FuzzDrawFunctions.cpp
View File

@ -81,7 +81,7 @@ static void init_bitmap(Fuzz* fuzz, SkBitmap* bmp) {
(SkColorType)colorType,
b ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
if (!bmp->tryAllocPixels(info)) {
SkDEBUGF("Bitmap not allocated\n");
SkDEBUGF(("Bitmap not allocated\n"));
}
SkColor c;
fuzz->next(&c);
@ -318,36 +318,36 @@ DEF_FUZZ(DrawFunctions, fuzz) {
SkDebugf("Could not initialize font.\n");
fuzz->signalBug();
}
SkDEBUGF("Fuzz DrawText\n");
SkDEBUGF(("Fuzz DrawText\n"));
fuzz_drawText(fuzz, f);
return;
}
case 1:
SkDEBUGF("Fuzz DrawRect\n");
SkDEBUGF(("Fuzz DrawRect\n"));
fuzz_drawRect(fuzz);
return;
case 2:
SkDEBUGF("Fuzz DrawCircle\n");
SkDEBUGF(("Fuzz DrawCircle\n"));
fuzz_drawCircle(fuzz);
return;
case 3:
SkDEBUGF("Fuzz DrawLine\n");
SkDEBUGF(("Fuzz DrawLine\n"));
fuzz_drawLine(fuzz);
return;
case 4:
SkDEBUGF("Fuzz DrawPath\n");
SkDEBUGF(("Fuzz DrawPath\n"));
fuzz_drawPath(fuzz);
return;
case 5:
SkDEBUGF("Fuzz DrawImage/DrawImageRect\n");
SkDEBUGF(("Fuzz DrawImage/DrawImageRect\n"));
fuzz_drawImage(fuzz);
return;
case 6:
SkDEBUGF("Fuzz DrawBitmap\n");
SkDEBUGF(("Fuzz DrawBitmap\n"));
fuzz_drawBitmap(fuzz);
return;
case 7:
SkDEBUGF("Fuzz DrawPaint\n");
SkDEBUGF(("Fuzz DrawPaint\n"));
fuzz_drawPaint(fuzz);
return;
}

14
fuzz/FuzzGradients.cpp
View File

@ -56,11 +56,11 @@ static void logOptionalMatrix(const char* label, const SkMatrix* m) {
return;
}
SkDEBUGF(" %s: [ ", label);
SkDEBUGF((" %s: [ ", label));
for (int i = 0; i < 9; ++i) {
SkDEBUGF("%.9g ", m->get(i));
SkDEBUGF(("%.9g ", m->get(i)));
}
SkDEBUGF("]\n");
SkDEBUGF(("]\n"));
}
static void logLinearGradient(const SkPoint pts[2],
@ -256,19 +256,19 @@ DEF_FUZZ(Gradients, fuzz) {
switch(i) {
case 0:
SkDEBUGF("LinearGradient\n");
SkDEBUGF(("LinearGradient\n"));
fuzzLinearGradient(fuzz);
return;
case 1:
SkDEBUGF("RadialGradient\n");
SkDEBUGF(("RadialGradient\n"));
fuzzRadialGradient(fuzz);
return;
case 2:
SkDEBUGF("TwoPointConicalGradient\n");
SkDEBUGF(("TwoPointConicalGradient\n"));
fuzzTwoPointConicalGradient(fuzz);
return;
}
SkDEBUGF("SweepGradient\n");
SkDEBUGF(("SweepGradient\n"));
fuzzSweepGradient(fuzz);
return;
}

4
include/core/SkTypes.h
View File

@ -58,7 +58,7 @@ SK_API extern void sk_abort_no_print(void);
#define SkDEBUGFAIL(message) SK_ABORT(message)
#define SkDEBUGFAILF(fmt, ...) SkASSERTF(false, fmt, ##__VA_ARGS__)
#define SkDEBUGCODE(...) __VA_ARGS__
#define SkDEBUGF(...) SkDebugf(__VA_ARGS__)
#define SkDEBUGF(args ) SkDebugf args
#define SkAssertResult(cond) SkASSERT(cond)
#else
#define SkASSERT(cond) static_cast<void>(0)
@ -66,7 +66,7 @@ SK_API extern void sk_abort_no_print(void);
#define SkDEBUGFAIL(message)
#define SkDEBUGFAILF(fmt, ...)
#define SkDEBUGCODE(...)
#define SkDEBUGF(...)
#define SkDEBUGF(args)
// unlike SkASSERT, this macro executes its condition in the non-debug build.
// The if is present so that this can be used with functions marked SK_WARN_UNUSED_RESULT.

4
src/core/SkRegion.cpp
View File

@ -137,7 +137,7 @@ void SkRegion::freeRuns() {
if (--fRunHead->fRefCnt == 0) {
//SkASSERT(gRgnAllocCounter > 0);
//SkDEBUGCODE(sk_atomic_dec(&gRgnAllocCounter));
//SkDEBUGF("************** gRgnAllocCounter::free %d\n", gRgnAllocCounter);
//SkDEBUGF(("************** gRgnAllocCounter::free %d\n", gRgnAllocCounter));
sk_free(fRunHead);
}
}
@ -278,7 +278,7 @@ bool SkRegion::setRuns(RunType runs[], int count) {
SkASSERT(count > 0);
if (isRunCountEmpty(count)) {
// SkDEBUGF("setRuns: empty\n");
// SkDEBUGF(("setRuns: empty\n"));
assert_sentinel(runs[count-1], true);
return this->setEmpty();
}

2
src/core/SkRegionPriv.h
View File

@ -66,7 +66,7 @@ public:
static RunHead* Alloc(int count) {
//SkDEBUGCODE(sk_atomic_inc(&gRgnAllocCounter);)
//SkDEBUGF("************** gRgnAllocCounter::alloc %d\n", gRgnAllocCounter);
//SkDEBUGF(("************** gRgnAllocCounter::alloc %d\n", gRgnAllocCounter));
if (count < SkRegion::kRectRegionRuns) {
return nullptr;

2
src/effects/Sk1DPathEffect.cpp
View File

@ -64,7 +64,7 @@ SkPath1DPathEffect::SkPath1DPathEffect(const SkPath& path, SkScalar advance, SkS
fInitialOffset = phase;
if ((unsigned)style > kMorph_Style) {
SkDEBUGF("SkPath1DPathEffect style enum out of range %d\n", style);
SkDEBUGF(("SkPath1DPathEffect style enum out of range %d\n", style));
}
fStyle = style;
}

62
src/ports/SkFontHost_FreeType.cpp
View File

@ -301,15 +301,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<FT_UInt>(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;
}
)
@ -319,8 +319,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;
}
@ -738,7 +738,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;
}
@ -782,7 +782,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> typeface,
// load the font file
if (nullptr == fFaceRec) {
SkDEBUGF("Could not create FT_Face.\n");
SkDEBUGF(("Could not create FT_Face.\n"));
return;
}
@ -866,7 +866,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> typeface,
return size;
}());
if (nullptr == ftSize) {
SkDEBUGF("Could not create FT_Size.\n");
SkDEBUGF(("Could not create FT_Size.\n"));
return;
}
@ -904,8 +904,8 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> 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;
}
@ -933,7 +933,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface> 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;
}
@ -1205,7 +1205,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
}
@ -1780,7 +1780,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));
}
}
@ -1804,8 +1804,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);
@ -1840,15 +1840,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;
@ -1869,12 +1869,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));
}
}
)

4
src/ports/SkFontHost_FreeType_common.cpp
View File

@ -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");
}
}

18
src/ports/SkFontMgr_android.cpp
View File

@ -187,8 +187,8 @@ public:
std::unique_ptr<SkStreamAsset> 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> 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<SkFontMgr_Android>(custom);
}

4
src/ports/SkOSFile_stdio.cpp
View File

@ -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;
}

4
src/ports/SkTypeface_win_dw.cpp
View File

@ -430,7 +430,7 @@ std::unique_ptr<SkAdvancedTypefaceMetrics> 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));
}
}
@ -439,7 +439,7 @@ std::unique_ptr<SkAdvancedTypefaceMetrics> 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;

2
src/utils/SkFloatUtils.h
View File

@ -116,7 +116,7 @@ public:
const Bits dist = DistanceBetweenSignAndMagnitudeNumbers(fU.bits,
rhs.fU.bits);
//SkDEBUGF("(%f, %f, %d) ", u_.value_, rhs.u_.value_, dist);
//SkDEBUGF(("(%f, %f, %d) ", u_.value_, rhs.u_.value_, dist));
return dist <= kMaxUlps;
}

2
src/utils/SkMultiPictureDocument.cpp
View File

@ -195,7 +195,7 @@ bool SkMultiPictureDocumentRead(SkStreamSeekable* stream,
// PagerCanvas::onDrawAnnotation().
picture->playback(&canvas);
if (canvas.fIndex != dstArrayCount) {
SkDEBUGF("Malformed SkMultiPictureDocument\n");
SkDEBUGF(("Malformed SkMultiPictureDocument\n"));
}
return true;
}

6
src/xps/SkXPSDevice.cpp
View File

@ -361,7 +361,7 @@ static HRESULT subset_typeface(SkXPSDevice::TypefaceUse* current) {
nullptr);
SkAutoTMalloc<unsigned char> fontPackageBuffer(fontPackageBufferRaw);
if (result != NO_ERROR) {
SkDEBUGF("CreateFontPackage Error %lu", result);
SkDEBUGF(("CreateFontPackage Error %lu", result));
return E_UNEXPECTED;
}
@ -1654,7 +1654,7 @@ void SkXPSDevice::drawPath(const SkPath& platonicPath,
pathIsMutable = true;
}
if (!Simplify(*fillablePath, xpsCompatiblePath)) {
SkDEBUGF("Could not simplify inverse winding path.");
SkDEBUGF(("Could not simplify inverse winding path."));
return;
}
}
@ -1818,7 +1818,7 @@ void SkXPSDevice::drawBitmap(const SkBitmap& bitmap,
void SkXPSDevice::drawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint& paint) {
//TODO: override this for XPS
SkDEBUGF("XPS drawSprite not yet implemented.");
SkDEBUGF(("XPS drawSprite not yet implemented."));
}
HRESULT SkXPSDevice::CreateTypefaceUse(const SkPaint& paint,