Changeset 177975 in webkit


Ignore:
Timestamp:
Jan 6, 2015 11:21:28 AM (9 years ago)
Author:
Antti Koivisto
Message:

Rename SimpleFontData::AdditionalFontData to SimpleFontData::SVGData
​https://bugs.webkit.org/show_bug.cgi?id=140124

Reviewed by Anders Carlsson.

The current name is vague and confusing (as AdditionalFontData is not a FontData).

  • platform/graphics/FontGlyphs.cpp:

(WebCore::FontGlyphs::glyphDataForCharacter):

  • platform/graphics/SimpleFontData.cpp:

(WebCore::SimpleFontData::SimpleFontData):
(WebCore::SimpleFontData::~SimpleFontData):
(WebCore::fillGlyphPage):
(WebCore::SimpleFontData::createScaledFontData):

  • platform/graphics/SimpleFontData.h:

(WebCore::SimpleFontData::widthForGlyph):

  • rendering/svg/SVGTextLayoutEngineSpacing.cpp:

(WebCore::SVGTextLayoutEngineSpacing::calculateSVGKerning):

  • rendering/svg/SVGTextRunRenderingContext.cpp:

(WebCore::svgFontAndFontFaceElementForFontData):

  • svg/SVGFontData.h:
Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r177970 r177975  
     12015-01-06  Antti Koivisto  <antti@apple.com>
     2
     3        Rename SimpleFontData::AdditionalFontData to SimpleFontData::SVGData
     4        https://bugs.webkit.org/show_bug.cgi?id=140124
     5
     6        Reviewed by Anders Carlsson.
     7
     8        The current name is vague and confusing (as AdditionalFontData is not a FontData).
     9
     10        * platform/graphics/FontGlyphs.cpp:
     11        (WebCore::FontGlyphs::glyphDataForCharacter):
     12        * platform/graphics/SimpleFontData.cpp:
     13        (WebCore::SimpleFontData::SimpleFontData):
     14        (WebCore::SimpleFontData::~SimpleFontData):
     15        (WebCore::fillGlyphPage):
     16        (WebCore::SimpleFontData::createScaledFontData):
     17        * platform/graphics/SimpleFontData.h:
     18        (WebCore::SimpleFontData::widthForGlyph):
     19        * rendering/svg/SVGTextLayoutEngineSpacing.cpp:
     20        (WebCore::SVGTextLayoutEngineSpacing::calculateSVGKerning):
     21        * rendering/svg/SVGTextRunRenderingContext.cpp:
     22        (WebCore::svgFontAndFontFaceElementForFontData):
     23        * svg/SVGFontData.h:
     24
    1252015-01-06  Timothy Horton  <timothy_horton@apple.com>
    226

  • trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp

    r177957 r177975  
    361361}
    362362
    363 GlyphData FontGlyphs::glyphDataForCharacter( UChar32 c, const FontDescription& description, FontDataVariant variant)
     363GlyphData FontGlyphs::glyphDataForCharacter(UChar32 c, const FontDescription& description, FontDataVariant variant)
    364364{
    365365    ASSERT(isMainThread());

  • trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp

    r177877 r177975  
    7777}
    7878
    79 SimpleFontData::SimpleFontData(std::unique_ptr<AdditionalFontData> fontData, float fontSize, bool syntheticBold, bool syntheticItalic)
     79SimpleFontData::SimpleFontData(std::unique_ptr<SVGData> svgData, float fontSize, bool syntheticBold, bool syntheticItalic)
    8080    : m_platformData(FontPlatformData(fontSize, syntheticBold, syntheticItalic))
    81     , m_fontData(WTF::move(fontData))
     81    , m_svgData(WTF::move(svgData))
    8282    , m_treatAsFixedPitch(false)
    8383    , m_isCustomFont(true)
    … …  
    9494#endif
    9595{
    96     m_fontData->initializeFontData(this, fontSize);
     96    m_svgData->initializeFontData(this, fontSize);
    9797}
    9898
    … …  
    155155SimpleFontData::~SimpleFontData()
    156156{
    157     if (!m_fontData)
     157    if (!isSVGFont())
    158158        platformDestroy();
    159159}
    … …  
    172172{
    173173#if ENABLE(SVG_FONTS)
    174     if (SimpleFontData::AdditionalFontData* additionalFontData = fontData->fontData())
    175         return additionalFontData->fillSVGGlyphPage(&pageToFill, offset, length, buffer, bufferLength, fontData);
     174    if (auto* svgData = fontData->svgData())
     175        return svgData->fillSVGGlyphPage(&pageToFill, offset, length, buffer, bufferLength, fontData);
    176176#endif
    177177    bool hasGlyphs = pageToFill.fill(offset, length, buffer, bufferLength, fontData);
    … …  
    406406PassRefPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
    407407{
    408     // FIXME: Support scaled fonts that used AdditionalFontData.
    409     if (m_fontData)
    410         return 0;
     408    if (isSVGFont())
     409        return nullptr;
    411410
    412411    return platformCreateScaledFontData(fontDescription, scaleFactor);

  • trunk/Source/WebCore/platform/graphics/SimpleFontData.h

    r177876 r177975  
    7171class SimpleFontData final : public FontData {
    7272public:
    73     class AdditionalFontData {
     73    class SVGData {
    7474        WTF_MAKE_FAST_ALLOCATED;
    7575    public:
    76         virtual ~AdditionalFontData() { }
     76        virtual ~SVGData() { }
    7777
    7878        virtual void initializeFontData(SimpleFontData*, float fontSize) = 0;
    7979        virtual float widthForSVGGlyph(Glyph, float fontSize) const = 0;
    8080        virtual bool fillSVGGlyphPage(GlyphPage*, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData*) const = 0;
    81         virtual bool applySVGGlyphSelection(WidthIterator&, GlyphData&, bool mirror, int currentCharacter, unsigned& advanceLength, String& normalizedSpacesStringCache) const = 0;
    8281    };
    8382
    … …  
    8988
    9089    // Used to create SVG Fonts.
    91     static PassRefPtr<SimpleFontData> create(std::unique_ptr<AdditionalFontData> fontData, float fontSize, bool syntheticBold, bool syntheticItalic)
     90    static PassRefPtr<SimpleFontData> create(std::unique_ptr<SVGData> svgData, float fontSize, bool syntheticBold, bool syntheticItalic)
    9291    {
    93         return adoptRef(new SimpleFontData(WTF::move(fontData), fontSize, syntheticBold, syntheticItalic));
     92        return adoptRef(new SimpleFontData(WTF::move(svgData), fontSize, syntheticBold, syntheticItalic));
    9493    }
    9594
    … …  
    177176    Pitch pitch() const { return m_treatAsFixedPitch ? FixedPitch : VariablePitch; }
    178177
    179     AdditionalFontData* fontData() const { return m_fontData.get(); }
    180     bool isSVGFont() const { return m_fontData != nullptr; }
     178    const SVGData* svgData() const { return m_svgData.get(); }
     179    bool isSVGFont() const { return !!m_svgData; }
    181180
    182181    virtual bool isCustomFont() const override { return m_isCustomFont; }
    … …  
    219218    SimpleFontData(const FontPlatformData&, bool isCustomFont = false, bool isLoading = false, bool isTextOrientationFallback = false);
    220219
    221     SimpleFontData(std::unique_ptr<AdditionalFontData>, float fontSize, bool syntheticBold, bool syntheticItalic);
     220    SimpleFontData(std::unique_ptr<SVGData>, float fontSize, bool syntheticBold, bool syntheticItalic);
    222221
    223222    void platformInit();
    … …  
    252251
    253252    FontPlatformData m_platformData;
    254     std::unique_ptr<AdditionalFontData> m_fontData;
     253    std::unique_ptr<SVGData> m_svgData;
    255254
    256255    mutable RefPtr<GlyphPage> m_glyphPageZero;
    … …  
    349348        return width;
    350349
    351     if (m_fontData)
    352         width = m_fontData->widthForSVGGlyph(glyph, m_platformData.size());
     350    if (isSVGFont())
     351        width = m_svgData->widthForSVGGlyph(glyph, m_platformData.size());
    353352#if ENABLE(OPENTYPE_VERTICAL)
    354353    else if (m_verticalData)

  • trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp

    r177955 r177975  
    5151    ASSERT(fontData.isSVGFont());
    5252
    53     const SVGFontData* svgFontData = static_cast<const SVGFontData*>(fontData.fontData());
     53    auto* svgFontData = static_cast<const SVGFontData*>(fontData.svgData());
    5454    SVGFontFaceElement* svgFontFace = svgFontData->svgFontFaceElement();
    5555    ASSERT(svgFontFace);

  • trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp

    r177955 r177975  
    4444    ASSERT(fontData->isSVGFont());
    4545
    46     const SVGFontData* svgFontData = static_cast<const SVGFontData*>(fontData->fontData());
     46    auto* svgFontData = static_cast<const SVGFontData*>(fontData->svgData());
    4747
    4848    fontFace = svgFontData->svgFontFaceElement();

  • trunk/Source/WebCore/svg/SVGFontData.h

    r174853 r177975  
    2929class SVGFontFaceElement;
    3030
    31 class SVGFontData : public SimpleFontData::AdditionalFontData {
     31class SVGFontData : public SimpleFontData::SVGData {
    3232public:
    3333    explicit SVGFontData(SVGFontFaceElement*);
    … …  
    3737    virtual float widthForSVGGlyph(Glyph, float fontSize) const override;
    3838    virtual bool fillSVGGlyphPage(GlyphPage*, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData*) const override;
    39     virtual bool applySVGGlyphSelection(WidthIterator&, GlyphData&, bool mirror, int currentCharacter, unsigned& advanceLength, String& normalizedSpacesStringCache) const override;
     39
     40    bool applySVGGlyphSelection(WidthIterator&, GlyphData&, bool mirror, int currentCharacter, unsigned& advanceLength, String& normalizedSpacesStringCache) const;
    4041
    4142    SVGFontFaceElement* svgFontFaceElement() const { return m_svgFontFaceElement; }
Note: See TracChangeset for help on using the changeset viewer.