Revert of Use removeFontFace to avoid resetting fontSelector.

Source/core/testing/InternalSettings.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 204 matching lines @@
     InternalSettingsGuardForSettings();
     settings()->setLayerSquashingEnabled(enabled);
 }
 
 void InternalSettings::setStandardFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->setStandardFontFamily(family, code);
+    settings()->genericFontFamilySettings().setStandard(family, code);
     m_page->setNeedsRecalcStyleInAllFrames();
 }
 
 void InternalSettings::setSerifFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->setSerifFontFamily(family, code);
+    settings()->genericFontFamilySettings().setSerif(family, code);
     m_page->setNeedsRecalcStyleInAllFrames();
 }
 
 void InternalSettings::setSansSerifFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->setSansSerifFontFamily(family, code);
+    settings()->genericFontFamilySettings().setSansSerif(family, code);
     m_page->setNeedsRecalcStyleInAllFrames();
 }
 
 void InternalSettings::setFixedFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->setFixedFontFamily(family, code);
+    settings()->genericFontFamilySettings().setFixed(family, code);
     m_page->setNeedsRecalcStyleInAllFrames();
 }
 
 void InternalSettings::setCursiveFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->setCursiveFontFamily(family, code);
+    settings()->genericFontFamilySettings().setCursive(family, code);
     m_page->setNeedsRecalcStyleInAllFrames();
 }
 
 void InternalSettings::setFantasyFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->setFantasyFontFamily(family, code);
+    settings()->genericFontFamilySettings().setFantasy(family, code);
     m_page->setNeedsRecalcStyleInAllFrames();
 }
 
 void InternalSettings::setPictographFontFamily(const AtomicString& family, const String& script, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     UScriptCode code = scriptNameToCode(script);
     if (code == USCRIPT_INVALID_CODE)
         return;
-    settings()->setPictographFontFamily(family, code);
+    settings()->genericFontFamilySettings().setPictograph(family, code);
     m_page->setNeedsRecalcStyleInAllFrames();
 }
 
 void InternalSettings::setTextAutosizingEnabled(bool enabled, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     settings()->setTextAutosizingEnabled(enabled);
 }
 
 void InternalSettings::setTextAutosizingWindowSizeOverride(int width, int height, ExceptionState& exceptionState)
@@ skipping 51 matching lines @@
     settings()->setDefaultVideoPosterURL(url);
 }
 
 void InternalSettings::setPasswordGenerationDecorationEnabled(bool enabled, ExceptionState& exceptionState)
 {
     InternalSettingsGuardForSettings();
     settings()->setPasswordGenerationDecorationEnabled(enabled);
 }
 
 }