Only FontCache should know about system font substitution

BUG=376377
TEST=no new test; just refactoring

Review URL: https://codereview.chromium.org/330543004

git-svn-id: svn://svn.chromium.org/blink/trunk@176265 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/css/LocalFontFaceSource.cpp

@@ -5,7 +5,6 @@
 #include "config.h"
 #include "core/css/LocalFontFaceSource.h"
 
-#include "platform/fonts/AlternateFontFamily.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/SimpleFontData.h"
@@ -15,13 +14,13 @@ namespace WebCore {
 
 bool LocalFontFaceSource::isLocalFontAvailable(const FontDescription& fontDescription)
 {
-    return FontCache::fontCache()->isPlatformFontAvailable(fontDescription, adjustFamilyNameToAvoidUnsupportedFonts(m_fontName));
+    return FontCache::fontCache()->isPlatformFontAvailable(fontDescription, m_fontName);
 }
 
 PassRefPtr<SimpleFontData> LocalFontFaceSource::createFontData(const FontDescription& fontDescription)
 {
     // We don't want to check alternate font family names here, so pass true as the checkingAlternateName parameter.
-    RefPtr<SimpleFontData> fontData = FontCache::fontCache()->getFontData(fontDescription, adjustFamilyNameToAvoidUnsupportedFonts(m_fontName), true);
+    RefPtr<SimpleFontData> fontData = FontCache::fontCache()->getFontData(fontDescription, m_fontName, true);
     m_histograms.record(fontData);
     return fontData.release();
 }

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

@@ -170,7 +170,7 @@ PassRefPtr<SimpleFontData> FontCache::fontDataFromFontPlatformData(const FontPla
 bool FontCache::isPlatformFontAvailable(const FontDescription& fontDescription, const AtomicString& family)
 {
     bool checkingAlternateName = true;
-    return getFontPlatformData(fontDescription, family, checkingAlternateName);
+    return getFontPlatformData(fontDescription, adjustFamilyNameToAvoidUnsupportedFonts(family), checkingAlternateName);
 }
 
 SimpleFontData* FontCache::getNonRetainedLastResortFallbackFont(const FontDescription& fontDescription)