Introduce GenericFontFamilySettings.

Source/core/page/Settings.cpp

Index: Source/core/page/Settings.cpp
diff --git a/Source/core/page/Settings.cpp b/Source/core/page/Settings.cpp
index 0ee25b12c5172fdaaab288c373c0870a99af9c07..15a26c3492e0c1f7368d36931d1106c4dd982fb3 100644
--- a/Source/core/page/Settings.cpp
+++ b/Source/core/page/Settings.cpp
@@ -50,33 +50,6 @@ static void setImageLoadingSettings(Page* page)
     }
 }
 
-// Sets the entry in the font map for the given script. If family is the empty string, removes the entry instead.
-static inline void setGenericFontFamilyMap(ScriptFontFamilyMap& fontMap, const AtomicString& family, UScriptCode script, Page* page)
-{
-    ScriptFontFamilyMap::iterator it = fontMap.find(static_cast<int>(script));
-    if (family.isEmpty()) {
-        if (it == fontMap.end())
-            return;
-        fontMap.remove(it);
-    } else if (it != fontMap.end() && it->value == family)
-        return;
-    else
-        fontMap.set(static_cast<int>(script), family);
-
-    if (page)
-        page->setNeedsRecalcStyleInAllFrames();
-}
-
-static inline const AtomicString& getGenericFontFamilyForScript(const ScriptFontFamilyMap& fontMap, UScriptCode script)
-{
-    ScriptFontFamilyMap::const_iterator it = fontMap.find(static_cast<int>(script));
-    if (it != fontMap.end())
-        return it->value;
-    if (script != USCRIPT_COMMON)
-        return getGenericFontFamilyForScript(fontMap, USCRIPT_COMMON);
-    return emptyAtom;
-}
-
 // NOTEs
 //  1) EditingMacBehavior comprises builds on Mac;
 //  2) EditingWindowsBehavior comprises builds on Windows;
@@ -148,76 +121,6 @@ PassOwnPtr<Settings> Settings::create(Page* page)
 
 SETTINGS_SETTER_BODIES
 
-const AtomicString& Settings::standardFontFamily(UScriptCode script) const
-{
-    return getGenericFontFamilyForScript(m_standardFontFamilyMap, script);
-}
-
-void Settings::setStandardFontFamily(const AtomicString& family, UScriptCode script)
-{
-    setGenericFontFamilyMap(m_standardFontFamilyMap, family, script, m_page);
-}
-
-const AtomicString& Settings::fixedFontFamily(UScriptCode script) const
-{
-    return getGenericFontFamilyForScript(m_fixedFontFamilyMap, script);
-}
-
-void Settings::setFixedFontFamily(const AtomicString& family, UScriptCode script)
-{
-    setGenericFontFamilyMap(m_fixedFontFamilyMap, family, script, m_page);
-}
-
-const AtomicString& Settings::serifFontFamily(UScriptCode script) const
-{
-    return getGenericFontFamilyForScript(m_serifFontFamilyMap, script);
-}
-
-void Settings::setSerifFontFamily(const AtomicString& family, UScriptCode script)
-{
-     setGenericFontFamilyMap(m_serifFontFamilyMap, family, script, m_page);
-}
-
-const AtomicString& Settings::sansSerifFontFamily(UScriptCode script) const
-{
-    return getGenericFontFamilyForScript(m_sansSerifFontFamilyMap, script);
-}
-
-void Settings::setSansSerifFontFamily(const AtomicString& family, UScriptCode script)
-{
-    setGenericFontFamilyMap(m_sansSerifFontFamilyMap, family, script, m_page);
-}
-
-const AtomicString& Settings::cursiveFontFamily(UScriptCode script) const
-{
-    return getGenericFontFamilyForScript(m_cursiveFontFamilyMap, script);
-}
-
-void Settings::setCursiveFontFamily(const AtomicString& family, UScriptCode script)
-{
-    setGenericFontFamilyMap(m_cursiveFontFamilyMap, family, script, m_page);
-}
-
-const AtomicString& Settings::fantasyFontFamily(UScriptCode script) const
-{
-    return getGenericFontFamilyForScript(m_fantasyFontFamilyMap, script);
-}
-
-void Settings::setFantasyFontFamily(const AtomicString& family, UScriptCode script)
-{
-    setGenericFontFamilyMap(m_fantasyFontFamilyMap, family, script, m_page);
-}
-
-const AtomicString& Settings::pictographFontFamily(UScriptCode script) const
-{
-    return getGenericFontFamilyForScript(m_pictographFontFamilyMap, script);
-}
-
-void Settings::setPictographFontFamily(const AtomicString& family, UScriptCode script)
-{
-    setGenericFontFamilyMap(m_pictographFontFamilyMap, family, script, m_page);
-}
-
 void Settings::setTextAutosizingEnabled(bool textAutosizingEnabled)
 {
     if (m_textAutosizingEnabled == textAutosizingEnabled)
@@ -306,17 +209,6 @@ void Settings::setMediaTypeOverride(const String& mediaTypeOverride)
     m_page->setNeedsRecalcStyleInAllFrames();
 }
 
-void Settings::resetFontFamilies()
-{
-    m_standardFontFamilyMap.clear();
-    m_serifFontFamilyMap.clear();
-    m_fixedFontFamilyMap.clear();
-    m_sansSerifFontFamilyMap.clear();
-    m_cursiveFontFamilyMap.clear();
-    m_fantasyFontFamilyMap.clear();
-    m_pictographFontFamilyMap.clear();
-}
-
 void Settings::setLoadsImagesAutomatically(bool loadsImagesAutomatically)
 {
     m_loadsImagesAutomatically = loadsImagesAutomatically;