Make style building for 'font-family' less custom.

Source/core/css/resolver/FontBuilder.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 35 matching lines @@
     // FIXME: The name is probably wrong, but matches StyleResolverState callsite for consistency.
     void initForStyleResolve(const Document&, RenderStyle*);
 
     void setInitial(float effectiveZoom);
 
     void didChangeFontParameters(bool);
 
     void inheritFrom(const FontDescription&);
     void fromSystemFont(CSSValueID, float effectiveZoom);
 
-    void setFontFamilyInitial();
-    void setFontFamilyInherit(const FontDescription&);
-    void setFontFamilyValue(CSSValue*);
+    FontFamily standardFontFamily() const;
+    AtomicString standardFontFamilyName() const;
+    AtomicString genericFontFamilyName(FontDescription::GenericFamilyType) const;
 
     void setWeight(FontWeight);
     void setSize(const FontDescription::Size&);
     void setStretch(FontStretch);
+    void setFamilyDescription(const FontDescription::FamilyDescription&);
     void setFeatureSettings(PassRefPtr<FontFeatureSettings>);
     void setScript(const String& locale);
     void setStyle(FontStyle);
     void setVariant(FontVariant);
     void setVariantLigatures(const FontDescription::VariantLigatures&);
     void setTextRendering(TextRenderingMode);
     void setKerning(FontDescription::Kerning);
     void setFontSmoothing(FontSmoothingMode);
 
     // FIXME: These need to just vend a Font object eventually.
     void createFont(PassRefPtrWillBeRawPtr<FontSelector>, const RenderStyle* parentStyle, RenderStyle*);
 
     void createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector>, RenderStyle*);
 
     // FIXME: These should not be necessary eventually.
     void setFontDirty(bool fontDirty) { m_fontDirty = fontDirty; }
     // FIXME: This is only used by an ASSERT in StyleResolver. Remove?
     bool fontDirty() const { return m_fontDirty; }
 
+    static FontDescription::FamilyDescription initialFamilyDescription() { return FontDescription::FamilyDescription(initialGenericFamily()); }
     static FontFeatureSettings* initialFeatureSettings() { return nullptr; }
-    static FontDescription::GenericFamilyType initialGenericFamily() { return FontDescription::NoFamily; }
+    static FontDescription::GenericFamilyType initialGenericFamily() { return FontDescription::StandardFamily; }
     static FontDescription::Size initialSize() { return FontDescription::Size(FontSize::initialKeywordSize(), 0.0f, false); }
     static TextRenderingMode initialTextRendering() { return AutoTextRendering; }
     static FontVariant initialVariant() { return FontVariantNormal; }
     static FontDescription::VariantLigatures initialVariantLigatures() { return FontDescription::VariantLigatures(); }
     static FontStyle initialStyle() { return FontStyleNormal; }
     static FontDescription::Kerning initialKerning() { return FontDescription::AutoKerning; }
     static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; }
     static FontStretch initialStretch() { return FontStretchNormal; }
     static FontWeight initialWeight() { return FontWeightNormal; }
 
     friend class FontDescriptionChangeScope;
 
 private:
 
-    // FIXME: "size" arg should be first for consistency with other similar functions.
+    void setFamilyDescription(FontDescription&, const FontDescription::FamilyDescription&);
     void setSize(FontDescription&, const FontDescription::Size&);
     void checkForOrientationChange(RenderStyle*);
     // This function fixes up the default font size if it detects that the current generic font family has changed. -dwh
     void checkForGenericFamilyChange(RenderStyle*, const RenderStyle* parentStyle);
     void updateComputedSize(RenderStyle*, const RenderStyle* parentStyle);
     void updateComputedSize(FontDescription&, RenderStyle*);
 
     float getComputedSizeFromSpecifiedSize(FontDescription&, float effectiveZoom, float specifiedSize);
 
     RawPtrWillBeMember<const Document> m_document;
@@ skipping 10 matching lines @@
     // is changed, FontBuilder tracks the need to update
     // style->font() with this bool.
     bool m_fontDirty;
 
     friend class FontBuilderTest;
 };
 
 }
 
 #endif