aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontMgr_android.cpp
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2018-07-09 12:43:39 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-18 15:37:41 +0000
commit2b0e6cd4d9b163fe61b3670127f5dc7cb7297f68 (patch)
tree5a5718fd8d7d0c7f03b98e826a4fadfcec4f38e0 /src/ports/SkFontMgr_android.cpp
parenta44a8a16a8e801c08ee407cfaaafd892d5c2c407 (diff)
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 <mtklein@google.com> > Commit-Queue: Hal Canary <halcanary@google.com> Change-Id: Ia06567e441a414f4dcdbe5663160082f889f9fef Reviewed-on: https://skia-review.googlesource.com/141762 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/ports/SkFontMgr_android.cpp')
-rw-r--r--src/ports/SkFontMgr_android.cpp18
1 files changed, 9 insertions, 9 deletions
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<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);
}