commit 8f514c7eccf76e3125e9b04521613082cb1f2a82
author Mike Klein <mtklein@chromium.org> Tue Sep 27 09:10:15 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Sep 27 14:26:33 2016 +0000
tree 5d6d92c9463409d86e9c4d4604c6577d097aa0ed
parent fc6c37b981daeece7474ce61070c707c37eefa62

We really shouldn't pass SkFontStyle to printf as %d.

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2721

Change-Id: I362063bea3909b2581d8e9b7860d4ac321082808
Reviewed-on: https://skia-review.googlesource.com/2721
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

gn/BUILD.gn

diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 16b9b53..c56e255 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -91,7 +91,6 @@
 
       cflags += [
         "-Wno-cast-align",
-        "-Wno-class-varargs",
         "-Wno-conditional-uninitialized",
         "-Wno-conversion",
         "-Wno-disabled-macro-expansion",

src/fonts/SkTestScalerContext.cpp

diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp
index 09b20ba..f7678a2 100644
--- a/src/fonts/SkTestScalerContext.cpp
+++ b/src/fonts/SkTestScalerContext.cpp
@@ -72,8 +72,10 @@
             return (int) index;
         }
     }
-    SkDEBUGF(("missing '%c' (%d) from %s %d\n", (char) charCode, charCode,
-            fDebugName, fDebugStyle));
+
+    SkDEBUGF(("missing '%c' (%d) from %s (weight %d, width %d, slant %d)\n",
+              (char) charCode, charCode, fDebugName,
+              fDebugStyle.weight(), fDebugStyle.width(), fDebugStyle.slant()));
     return 0;
 }
 

tools/sk_tool_utils_font.cpp

diff --git a/tools/sk_tool_utils_font.cpp b/tools/sk_tool_utils_font.cpp
index 8a7ab46..402402f 100644
--- a/tools/sk_tool_utils_font.cpp
+++ b/tools/sk_tool_utils_font.cpp
@@ -43,7 +43,8 @@
         if (!fontData) {
             // Once all legacy callers to portable fonts are converted, replace this with
             // SK_ABORT();
-            SkDebugf("missing %s %d\n", name, style);
+            SkDebugf("missing %s weight %d, width %d, slant %d\n",
+                     name, style.weight(), style.width(), style.slant());
             // If we called SkTypeface::CreateFromName() here we'd recurse infinitely,
             // so we reimplement its core logic here inline without the recursive aspect.
             SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());