Create the document font using normal FontBuilder calls.

Source/core/css/resolver/FontBuilder.cpp

 /*
  * 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 30 matching lines @@
 {
     ASSERT(document.frame());
 }
 
 void FontBuilder::setInitial(float effectiveZoom)
 {
     ASSERT(m_document.settings());
     if (!m_document.settings())
         return;
 
-    setFamilyDescription(m_fontDescription, FontBuilder::initialFamilyDescription());
-    setSize(m_fontDescription, FontBuilder::initialSize());
+    setFamilyDescription(FontBuilder::initialFamilyDescription());
+    setSize(FontBuilder::initialSize());
 }
 
 void FontBuilder::didChangeEffectiveZoom()
 {
     set(PropertySetFlag::EffectiveZoom);
 }
 
 void FontBuilder::didChangeTextOrientation()
 {
     set(PropertySetFlag::TextOrientation);
@@ skipping 38 matching lines @@
         return FontFamilyNames::webkit_cursive;
     case FontDescription::FantasyFamily:
         return FontFamilyNames::webkit_fantasy;
     case FontDescription::PictographFamily:
         return FontFamilyNames::webkit_pictograph;
     }
 }
 
 void FontBuilder::setFamilyDescription(const FontDescription::FamilyDescription& familyDescription)
 {
-    setFamilyDescription(m_fontDescription, familyDescription);
+    set(PropertySetFlag::Family);
+
+    bool isInitial = familyDescription.genericFamily == FontDescription::StandardFamily && familyDescription.family.familyIsEmpty();
+
+    m_fontDescription.setGenericFamily(familyDescription.genericFamily);
+    m_fontDescription.setFamily(isInitial ? standardFontFamily() : familyDescription.family);
 }
 
 void FontBuilder::setWeight(FontWeight fontWeight)
 {
     set(PropertySetFlag::Weight);
 
     m_fontDescription.setWeight(fontWeight);
 }
 
 void FontBuilder::setSize(const FontDescription::Size& size)
 {
-    setSize(m_fontDescription, size);
+    float specifiedSize = size.value;
+
+    if (specifiedSize < 0)
+        return;
+
+    set(PropertySetFlag::Size);
+
+    // Overly large font sizes will cause crashes on some platforms (such as Windows).
+    // Cap font size here to make sure that doesn't happen.
+    specifiedSize = std::min(maximumAllowedFontSize, specifiedSize);
+
+    m_fontDescription.setKeywordSize(size.keyword);
+    m_fontDescription.setSpecifiedSize(specifiedSize);
+    m_fontDescription.setIsAbsoluteSize(size.isAbsolute);
 }
 
 void FontBuilder::setStretch(FontStretch fontStretch)
 {
     set(PropertySetFlag::Stretch);
 
     m_fontDescription.setStretch(fontStretch);
 }
 
 void FontBuilder::setScript(const String& locale)
@@ skipping 46 matching lines @@
     m_fontDescription.setFontSmoothing(foontSmoothingMode);
 }
 
 void FontBuilder::setFeatureSettings(PassRefPtr<FontFeatureSettings> settings)
 {
     set(PropertySetFlag::FeatureSettings);
 
     m_fontDescription.setFeatureSettings(settings);
 }
 
-void FontBuilder::setFamilyDescription(FontDescription& fontDescription, const FontDescription::FamilyDescription& familyDescription)
-{
-    set(PropertySetFlag::Family);
-
-    bool isInitial = familyDescription.genericFamily == FontDescription::StandardFamily && familyDescription.family.familyIsEmpty();
-
-    fontDescription.setGenericFamily(familyDescription.genericFamily);
-    fontDescription.setFamily(isInitial ? standardFontFamily() : familyDescription.family);
-}
-
-void FontBuilder::setSize(FontDescription& fontDescription, const FontDescription::Size& size)
-{
-    float specifiedSize = size.value;
-
-    if (specifiedSize < 0)
-        return;
-
-    set(PropertySetFlag::Size);
-
-    // Overly large font sizes will cause crashes on some platforms (such as Windows).
-    // Cap font size here to make sure that doesn't happen.
-    specifiedSize = std::min(maximumAllowedFontSize, specifiedSize);
-
-    fontDescription.setKeywordSize(size.keyword);
-    fontDescription.setSpecifiedSize(specifiedSize);
-    fontDescription.setIsAbsoluteSize(size.isAbsolute);
-}
-
 float FontBuilder::getComputedSizeFromSpecifiedSize(FontDescription& fontDescription, float effectiveZoom, float specifiedSize)
 {
     float zoomFactor = effectiveZoom;
     // FIXME: Why is this here!!!!?!
     if (LocalFrame* frame = m_document.frame())
         zoomFactor *= frame->textZoomFactor();
 
     return FontSize::getComputedSizeFromSpecifiedSize(&m_document, zoomFactor, fontDescription.isAbsoluteSize(), specifiedSize);
 }
 
@@ skipping 142 matching lines @@
         updateOrientation(description, style);
 
     updateSpecifiedSize(description, style);
     updateComputedSize(description, style);
 
     style->setFontDescription(description);
     style->font().update(fontSelector);
     m_flags = 0;
 }
 
-void FontBuilder::createFontForDocument(PassRefPtrWillBeRawPtr<FontSelector> fontSelector, RenderStyle* documentStyle)
-{
-    FontDescription fontDescription = FontDescription();
-    fontDescription.setLocale(documentStyle->locale());
-    fontDescription.setScript(localeToScriptCodeForFontSelection(documentStyle->locale()));
-
-    setFamilyDescription(fontDescription, FontBuilder::initialFamilyDescription());
-    setSize(fontDescription, FontDescription::Size(FontSize::initialKeywordSize(), 0.0f, false));
-    updateSpecifiedSize(fontDescription, documentStyle);
-    updateComputedSize(fontDescription, documentStyle);
-
-    FontOrientation fontOrientation;
-    NonCJKGlyphOrientation glyphOrientation;
-    getFontAndGlyphOrientation(documentStyle, fontOrientation, glyphOrientation);
-    fontDescription.setOrientation(fontOrientation);
-    fontDescription.setNonCJKGlyphOrientation(glyphOrientation);
-    documentStyle->setFontDescription(fontDescription);
-    documentStyle->font().update(fontSelector);
 }
-
-}