Remove RenderStyle member from FontBuilder.

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 25 matching lines @@
 class RenderStyle;
 
 class FontDescriptionChangeScope;
 
 class FontBuilder {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(FontBuilder);
 public:
     FontBuilder(const Document&);
 
-    void setStyle(RenderStyle* style) { m_style = style; }
+    void setFontDescription(const FontDescription& fd) { m_fontDescription = fd; }
+    const FontDescription& fontDescription() const { return m_fontDescription; }
+
     void setInitial(float effectiveZoom);
 
     void didChangeFontParameters(bool);
 
     void inheritFrom(const FontDescription&);
 
     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 createFont(PassRefPtrWillBeRawPtr<FontSelector>, RenderStyle*, const RenderStyle* parentStyle);
 
     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; }
@@ skipping 16 matching lines @@
     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);
 
     const Document& m_document;
-    // FIXME: This member is here on a short-term lease. The plan is to remove
-    // any notion of RenderStyle from here, allowing FontBuilder to build Font objects
-    // directly, rather than as a byproduct of calling RenderStyle::setFontDescription.
-    // FontDescriptionChangeScope should be the only consumer of this member.
-    // If you're using it, U R DOIN IT WRONG.
-    RenderStyle* m_style;
+    FontDescription m_fontDescription;
 
     // Fontbuilder is responsbile for creating the Font()
     // object on RenderStyle from various other font-related
     // properties on RenderStyle. Whenever one of those
     // is changed, FontBuilder tracks the need to update
     // style->font() with this bool.
     bool m_fontDirty;
-
-    friend class FontBuilderTest;
 };
 
 }
 
 #endif