Changeset 165611 in webkit


Ignore:
Timestamp:
Mar 14, 2014 3:12:51 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Fix the !ENABLE(SVG_FONTS) build
https://bugs.webkit.org/show_bug.cgi?id=130193

Patch by Zsolt Borbely <borbezs@inf.u-szeged.hu> on 2014-03-14
Reviewed by Dirk Schulze.

Add missing ENABLE(SVG_FONTS) guards for createGlyphToPathTranslator() function
in SVGTextRunRenderingContext.h and TextRun.h, because when the SVG_FONTS are
disabled the function is not implemented.

  • platform/graphics/TextRun.h:
  • rendering/svg/SVGTextRunRenderingContext.h:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r165609 r165611  
     12014-03-14  Zsolt Borbely  <borbezs@inf.u-szeged.hu>
     2
     3        Fix the !ENABLE(SVG_FONTS) build
     4        https://bugs.webkit.org/show_bug.cgi?id=130193
     5
     6        Reviewed by Dirk Schulze.
     7
     8        Add missing ENABLE(SVG_FONTS) guards for createGlyphToPathTranslator() function
     9        in SVGTextRunRenderingContext.h and TextRun.h, because when the SVG_FONTS are
     10        disabled the function is not implemented.
     11
     12        * platform/graphics/TextRun.h:
     13        * rendering/svg/SVGTextRunRenderingContext.h:
     14
    1152014-03-14  Sergio Villar Senin  <svillar@igalia.com>
    216
  • trunk/Source/WebCore/platform/graphics/TextRun.h

    r164842 r165611  
    190190    class RenderingContext : public RefCounted<RenderingContext> {
    191191    public:
    192         virtual std::unique_ptr<GlyphToPathTranslator> createGlyphToPathTranslator(const SimpleFontData&, const GlyphBuffer&, int from, int numGlyphs, const FloatPoint&) const = 0;
    193192        virtual ~RenderingContext() { }
    194193
     
    198197        virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, String& glyphName) const = 0;
    199198        virtual bool applySVGKerning(const SimpleFontData*, WidthIterator&, GlyphBuffer*, int from) const = 0;
     199        virtual std::unique_ptr<GlyphToPathTranslator> createGlyphToPathTranslator(const SimpleFontData&, const GlyphBuffer&, int from, int numGlyphs, const FloatPoint&) const = 0;
    200200#endif
    201201    };
  • trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h

    r164842 r165611  
    6060    virtual ~SVGTextRunRenderingContext() { }
    6161
     62#if ENABLE(SVG_FONTS)
    6263    virtual std::unique_ptr<GlyphToPathTranslator> createGlyphToPathTranslator(const SimpleFontData&, const GlyphBuffer&, int from, int numGlyphs, const FloatPoint&) const override;
     64#endif
    6365
    6466    RenderObject& m_renderer;
Note: See TracChangeset for help on using the changeset viewer.