SkTypeface::MakeFromName to take SkFontStyle.

src/utils/SkWhitelistTypefaces.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkChecksum.h"
 #include "SkFontDescriptor.h"
 #include "SkStream.h"
@@ skipping 10 matching lines @@
 sk_sp<SkTypeface> WhitelistDeserializeTypeface(SkStream* );
 extern bool CheckChecksums();
 extern bool GenerateChecksums();
 
 #if WHITELIST_DEBUG
 static bool timesNewRomanSerializedNameOnly = false;
 #endif
 
 #define SUBNAME_PREFIX "sk_"
 
-static bool font_name_is_local(const char* fontName, SkTypeface::Style style) {
+static bool font_name_is_local(const char* fontName, SkFontStyle style) {
     if (!strcmp(fontName, "DejaVu Sans")) {
         return true;
     }
     sk_sp<SkTypeface> defaultFace(SkTypeface::MakeFromName(nullptr, style));
     sk_sp<SkTypeface> foundFace(SkTypeface::MakeFromName(fontName, style));
     return defaultFace != foundFace;
 }
 
 static int whitelist_name_index(const SkTypeface* tf) {
 
@@ skipping 113 matching lines @@
     if (!is_local(tf)) {
         serialize_name_only(tf, wstream);
         return;
     }
     int whitelistIndex = whitelist_name_index(tf);
     if (whitelistIndex < 0) {
         serialize_full(tf, wstream);
         return;
     }
     const char* fontName = whitelist[whitelistIndex].fFontName;
-    if (!font_name_is_local(fontName, tf->style())) {
+    if (!font_name_is_local(fontName, tf->fontStyle())) {
 #if WHITELIST_DEBUG
         SkDebugf("name not found locally \"%s\" style=%d\n", fontName, tf->style());
 #endif
         serialize_full(tf, wstream);
         return;
     }
     uint32_t checksum = compute_checksum(tf);
     if (whitelist[whitelistIndex].fChecksum != checksum) {
 #if WHITELIST_DEBUG
         if (whitelist[whitelistIndex].fChecksum) {
@@ skipping 17 matching lines @@
     if (data) {
         sk_sp<SkTypeface> typeface(SkTypeface::MakeFromFontData(data));
         if (typeface) {
             return typeface;
         }
     }
     const char* familyName = desc.getFamilyName();
     if (!strncmp(SUBNAME_PREFIX, familyName, sizeof(SUBNAME_PREFIX) - 1)) {
         familyName += sizeof(SUBNAME_PREFIX) - 1;
     }
-    return SkTypeface::MakeFromName(familyName, desc.getStyle());
+    return SkTypeface::MakeFromName(familyName, SkFontStyle::FromOldStyle(desc.getStyle()));
 }
 
 bool CheckChecksums() {
     for (int i = 0; i < whitelistCount; ++i) {
         const char* fontName = whitelist[i].fFontName;
-        sk_sp<SkTypeface> tf(SkTypeface::MakeFromName(fontName, SkTypeface::kNormal));
+        sk_sp<SkTypeface> tf(SkTypeface::MakeFromName(fontName, SkFontStyle()));
         uint32_t checksum = compute_checksum(tf.get());
         if (whitelist[i].fChecksum != checksum) {
             return false;
         }
     }
     return true;
 }
 
 const char checksumFileName[] = "SkWhitelistChecksums.cpp";
 
@@ skipping 34 matching lines @@
     FILE* file = sk_fopen(checksumFileName, kWrite_SkFILE_Flag);
     if (!file) {
         SkDebugf("Can't open %s for writing.\n", checksumFileName);
         return false;
     }
     SkString line;
     line.printf(checksumHeader, __FUNCTION__, __FILE__, checksumFileName);
     sk_fwrite(line.c_str(), line.size(), file);
     for (int i = 0; i < whitelistCount; ++i) {
         const char* fontName = whitelist[i].fFontName;
-        sk_sp<SkTypeface> tf(SkTypeface::MakeFromName(fontName, SkTypeface::kNormal));
+        sk_sp<SkTypeface> tf(SkTypeface::MakeFromName(fontName, SkFontStyle()));
         uint32_t checksum = compute_checksum(tf.get());
         line.printf(checksumEntry, fontName, checksum);
         sk_fwrite(line.c_str(), line.size(), file);
     }
     sk_fwrite(checksumTrailer, sizeof(checksumTrailer) - 1, file);
     sk_fclose(file);
     return true;
 }