Avoid checking family name in getLastResortFallbackFont() on Windows

third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

 
 /*
  * Copyright (c) 2006, 2007, 2008, 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 125 matching lines @@
   }
 
   return nullptr;
 }
 
 PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(
     const FontDescription& description,
     ShouldRetain shouldRetain) {
   const FontFaceCreationParams fallbackCreationParams(
       getFallbackFontFamily(description));
-  const FontPlatformData* fontPlatformData =
-      getFontPlatformData(description, fallbackCreationParams);
+  const FontPlatformData* fontPlatformData = getFontPlatformData(
+      description, fallbackCreationParams, AlternateFontName::LastResort);
 
   // We should at least have Sans or Arial which is the last resort fallback of
   // SkFontHost ports.
   if (!fontPlatformData) {
     DEFINE_STATIC_LOCAL(const FontFaceCreationParams, sansCreationParams,
                         (AtomicString("Sans")));
-    fontPlatformData = getFontPlatformData(description, sansCreationParams);
+    fontPlatformData = getFontPlatformData(description, sansCreationParams,
+                                           AlternateFontName::LastResort);
   }
   if (!fontPlatformData) {
     DEFINE_STATIC_LOCAL(const FontFaceCreationParams, arialCreationParams,
                         (AtomicString("Arial")));
-    fontPlatformData = getFontPlatformData(description, arialCreationParams);
+    fontPlatformData = getFontPlatformData(description, arialCreationParams,
+                                           AlternateFontName::LastResort);
   }
 #if OS(WIN)
   // Try some more Windows-specific fallbacks.
   if (!fontPlatformData) {
     DEFINE_STATIC_LOCAL(const FontFaceCreationParams, msuigothicCreationParams,
                         (AtomicString("MS UI Gothic")));
-    fontPlatformData =
-        getFontPlatformData(description, msuigothicCreationParams);
+    fontPlatformData = getFontPlatformData(
+        description, msuigothicCreationParams, AlternateFontName::LastResort);
   }
   if (!fontPlatformData) {
     DEFINE_STATIC_LOCAL(const FontFaceCreationParams, mssansserifCreationParams,
                         (AtomicString("Microsoft Sans Serif")));
-    fontPlatformData =
-        getFontPlatformData(description, mssansserifCreationParams);
+    fontPlatformData = getFontPlatformData(
+        description, mssansserifCreationParams, AlternateFontName::LastResort);
   }
   if (!fontPlatformData) {
     DEFINE_STATIC_LOCAL(const FontFaceCreationParams, segoeuiCreationParams,
                         (AtomicString("Segoe UI")));
-    fontPlatformData = getFontPlatformData(description, segoeuiCreationParams);
+    fontPlatformData = getFontPlatformData(description, segoeuiCreationParams,
+                                           AlternateFontName::LastResort);
   }
   if (!fontPlatformData) {
     DEFINE_STATIC_LOCAL(const FontFaceCreationParams, calibriCreationParams,
                         (AtomicString("Calibri")));
-    fontPlatformData = getFontPlatformData(description, calibriCreationParams);
+    fontPlatformData = getFontPlatformData(description, calibriCreationParams,
+                                           AlternateFontName::LastResort);
   }
   if (!fontPlatformData) {
     DEFINE_STATIC_LOCAL(const FontFaceCreationParams,
                         timesnewromanCreationParams,
                         (AtomicString("Times New Roman")));
     fontPlatformData =
-        getFontPlatformData(description, timesnewromanCreationParams);
+        getFontPlatformData(description, timesnewromanCreationParams,
+                            AlternateFontName::LastResort);
   }
   if (!fontPlatformData) {
     DEFINE_STATIC_LOCAL(const FontFaceCreationParams, couriernewCreationParams,
                         (AtomicString("Courier New")));
-    fontPlatformData =
-        getFontPlatformData(description, couriernewCreationParams);
+    fontPlatformData = getFontPlatformData(
+        description, couriernewCreationParams, AlternateFontName::LastResort);
   }
 #endif
 
   ASSERT(fontPlatformData);
   return fontDataFromFontPlatformData(fontPlatformData, shouldRetain);
 }
 
 sk_sp<SkTypeface> FontCache::createTypeface(
     const FontDescription& fontDescription,
     const FontFaceCreationParams& creationParams,
@@ skipping 42 matching lines @@
   // legacyCreateTypeface on all platforms.
   sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());
   return sk_sp<SkTypeface>(
       fm->legacyCreateTypeface(name.data(), fontDescription.skiaFontStyle()));
 }
 
 #if !OS(WIN)
 std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(
     const FontDescription& fontDescription,
     const FontFaceCreationParams& creationParams,
-    float fontSize) {
+    float fontSize,
+    AlternateFontName) {
   CString name;
   sk_sp<SkTypeface> tf = createTypeface(fontDescription, creationParams, name);
   if (!tf)
     return nullptr;
 
   return WTF::wrapUnique(new FontPlatformData(
       tf, name.data(), fontSize, (numericFontWeight(fontDescription.weight()) >
                                   200 + tf->fontStyle().weight()) ||
                                      fontDescription.isSyntheticBold(),
       ((fontDescription.style() == FontStyleItalic ||
         fontDescription.style() == FontStyleOblique) &&
        !tf->isItalic()) ||
           fontDescription.isSyntheticItalic(),
       fontDescription.orientation()));
 }
 #endif  // !OS(WIN)
 
 }  // namespace blink