Fix matching Roboto Bold for src: local("Roboto Regular")

third_party/WebKit/Source/platform/fonts/FontCache.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 154 matching lines @@
       } else if (anotherSize) {
         *found = scaleFontPlatformData(*anotherSize, fontDescription,
                                        creationParams, size);
       }
     }
 
     result = found->get();
     foundResult = result || !addResult.isNewEntry;
   }
 
-  if (!foundResult && alternateFontName != AlternateFontName::NoAlternate &&
+  if (!foundResult && alternateFontName == AlternateFontName::AllowAlternate &&
       creationParams.creationType() == CreateFontByFamily) {
     // We were unable to find a font. We have a small set of fonts that we alias
     // to other names, e.g., Arial/Helvetica, Courier/Courier New, etc. Try
     // looking up the font under the aliased name.
     const AtomicString& alternateName =
         alternateFamilyName(creationParams.family());
     if (!alternateName.isEmpty()) {
       FontFaceCreationParams createByAlternateFamily(alternateName);
       result = getFontPlatformData(fontDescription, createByAlternateFamily,
                                    AlternateFontName::NoAlternate);
@@ skipping 103 matching lines @@
     gFontDataCache = new FontDataCache;
 
 #if DCHECK_IS_ON()
   if (shouldRetain == DoNotRetain)
     ASSERT(m_purgePreventCount);
 #endif
 
   return gFontDataCache->get(platformData, shouldRetain, subpixelAscentDescent);
 }
 
-bool FontCache::isPlatformFontAvailable(const FontDescription& fontDescription,
-                                        const AtomicString& family) {
+bool FontCache::isPlatformFamilyMatchAvailable(
+    const FontDescription& fontDescription,
+    const AtomicString& family) {
   return getFontPlatformData(
       fontDescription,
       FontFaceCreationParams(adjustFamilyNameToAvoidUnsupportedFonts(family)),
       AlternateFontName::NoAlternate);
 }
 
+bool FontCache::isPlatformFontUniqueNameMatchAvailable(
+    const FontDescription& fontDescription,
+    const AtomicString& uniqueFontName) {
+  return getFontPlatformData(fontDescription,
+                             FontFaceCreationParams(uniqueFontName),
+                             AlternateFontName::LocalUniqueFace);
+}
+
 String FontCache::firstAvailableOrFirst(const String& families) {
   // The conversions involve at least two string copies, and more if non-ASCII.
   // For now we prefer shared code over the cost because a) inputs are
   // only from grd/xtb and all ASCII, and b) at most only a few times per
   // setting change/script.
   return String::fromUTF8(
       gfx::FontList::FirstAvailableOrFirst(families.utf8().data()).c_str());
 }
 
 SimpleFontData* FontCache::getNonRetainedLastResortFallbackFont(
@@ skipping 176 matching lines @@
   for (iter = gFallbackListShaperCache->begin();
        iter != gFallbackListShaperCache->end(); ++iter) {
     shapeResultCacheSize += iter->value->byteSize();
   }
   dump->AddScalar("size", "bytes", shapeResultCacheSize);
   memoryDump->AddSuballocation(dump->guid(),
                                WTF::Partitions::kAllocatedObjectPoolName);
 }
 
 }  // namespace blink