Clean up SkTypes.h.

tests/FontNamesTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 
 #include "SkCommandLineFlags.h"
@@ skipping 143 matching lines @@
 
             SkAutoTUnref<SkTypeface> typeface(set->createTypeface(j));
             if (NULL == typeface.get()) {
                 //TODO: SkFontMgr_fontconfig always returns NULL?
                 continue;
             }
 
             SkString familyName;
             typeface->getFamilyName(&familyName);
             if (verbose) {
-                printf("[%s]\n", familyName.c_str());
+                SkDebugf("[%s]\n", familyName.c_str());
             }
 
             SkAutoTUnref<SkTypeface::LocalizedStrings> familyNamesIter(
                 typeface->createFamilyNameIterator());
             SkTypeface::LocalizedString familyNameLocalized;
             while (familyNamesIter->next(&familyNameLocalized)) {
                 if (verbose) {
-                    printf("(%s) <%s>\n", familyNameLocalized.fString.c_str(),
+                    SkDebugf("(%s) <%s>\n", familyNameLocalized.fString.c_str(),
                                           familyNameLocalized.fLanguage.c_str());
                 }
             }
 
             size_t nameTableSize = typeface->getTableSize(nameTag);
             if (0 == nameTableSize) {
                 continue;
             }
             SkAutoTMalloc<uint8_t> nameTableData(nameTableSize);
             size_t copied = typeface->getTableData(nameTag, 0, nameTableSize, nameTableData.get());
             if (copied != nameTableSize) {
                 continue;
             }
 
             SkOTTableName::Iterator::Record record;
             SkOTTableName::Iterator familyNameIter(*((SkOTTableName*)nameTableData.get()),
                 SkOTTableName::Record::NameID::Predefined::FontFamilyName);
             while (familyNameIter.next(record)) {
                 REPORTER_ASSERT_MESSAGE(reporter,
                     SkOTTableName::Record::NameID::Predefined::FontFamilyName == record.type,
                     "Requested family name, got something else."
                 );
                 if (verbose) {
-                    printf("{%s} <%s>\n", record.name.c_str(), record.language.c_str());
+                    SkDebugf("{%s} <%s>\n", record.name.c_str(), record.language.c_str());
                 }
             }
 
             SkOTTableName::Iterator styleNameIter(*((SkOTTableName*)nameTableData.get()),
                 SkOTTableName::Record::NameID::Predefined::FontSubfamilyName);
             while (styleNameIter.next(record)) {
                 REPORTER_ASSERT_MESSAGE(reporter,
                     SkOTTableName::Record::NameID::Predefined::FontSubfamilyName == record.type,
                     "Requested subfamily name, got something else."
                 );
                 if (verbose) {
-                    printf("{{%s}} <%s>\n", record.name.c_str(), record.language.c_str());
+                    SkDebugf("{{%s}} <%s>\n", record.name.c_str(), record.language.c_str());
                 }
             }
 
             if (verbose) {
-                printf("\n");
+                SkDebugf("\n");
             }
         }
     }
 }
 
 DEFINE_bool(verboseFontNames, false, "verbose FontNames test.");
 
 static void TestFontNames(skiatest::Reporter* reporter) {
     test_synthetic(reporter, FLAGS_verboseFontNames);
     test_systemfonts(reporter, FLAGS_verboseFontNames);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("FontNames", FontNamesTestClass, TestFontNames)