Introduce GenericFontFamilySettings.

Source/core/css/CSSFontSelector.cpp

 /*
  * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved.
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 151 matching lines @@
 }
 
 static AtomicString familyNameFromSettings(Settings* settings, const FontDescription& fontDescription, const AtomicString& genericFamilyName)
 {
     if (!settings)
         return emptyAtom;
 
     UScriptCode script = fontDescription.script();
 
     if (fontDescription.genericFamily() == FontDescription::StandardFamily && !fontDescription.isSpecifiedFont())
-        return settings->standardFontFamily(script);
+        return settings->genericFontFamilySettings().standard(script);
 
 #if OS(ANDROID)
     return FontCache::getGenericFamilyNameForScript(genericFamilyName, script);
 #else
     if (genericFamilyName == FontFamilyNames::webkit_serif)
-        return settings->serifFontFamily(script);
+        return settings->genericFontFamilySettings().serif(script);
     if (genericFamilyName == FontFamilyNames::webkit_sans_serif)
-        return settings->sansSerifFontFamily(script);
+        return settings->genericFontFamilySettings().sansSerif(script);
     if (genericFamilyName == FontFamilyNames::webkit_cursive)
-        return settings->cursiveFontFamily(script);
+        return settings->genericFontFamilySettings().cursive(script);
     if (genericFamilyName == FontFamilyNames::webkit_fantasy)
-        return settings->fantasyFontFamily(script);
+        return settings->genericFontFamilySettings().fantasy(script);
     if (genericFamilyName == FontFamilyNames::webkit_monospace)
-        return settings->fixedFontFamily(script);
+        return settings->genericFontFamilySettings().fixed(script);
     if (genericFamilyName == FontFamilyNames::webkit_pictograph)
-        return settings->pictographFontFamily(script);
+        return settings->genericFontFamilySettings().pictograph(script);
     if (genericFamilyName == FontFamilyNames::webkit_standard)
-        return settings->standardFontFamily(script);
+        return settings->genericFontFamilySettings().standard(script);
 #endif
     return emptyAtom;
 }
 
 PassRefPtr<FontData> CSSFontSelector::getFontData(const FontDescription& fontDescription, const AtomicString& familyName)
 {
     if (!m_document || !m_document->frame())
         return 0;
 
     if (CSSSegmentedFontFace* face = m_cssSegmentedFontFaceCache.getFontFace(fontDescription, familyName))
@@ skipping 29 matching lines @@
 {
     m_fontLoader.addFontToBeginLoading(font);
 }
 
 void CSSFontSelector::loadPendingFonts()
 {
     m_fontLoader.loadPendingFonts();
 }
 
 }