Title: [165611] trunk/Source/WebCore
- Revision
- 165611
- Author
- commit-qu...@webkit.org
- Date
- 2014-03-14 03:12:51 -0700 (Fri, 14 Mar 2014)
Log Message
Fix the !ENABLE(SVG_FONTS) build
https://bugs.webkit.org/show_bug.cgi?id=130193
Patch by Zsolt Borbely <borb...@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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165610 => 165611)
--- trunk/Source/WebCore/ChangeLog 2014-03-14 09:21:25 UTC (rev 165610)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 10:12:51 UTC (rev 165611)
@@ -1,3 +1,17 @@
+2014-03-14 Zsolt Borbely <borb...@inf.u-szeged.hu>
+
+ Fix the !ENABLE(SVG_FONTS) build
+ https://bugs.webkit.org/show_bug.cgi?id=130193
+
+ 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:
+
2014-03-14 Sergio Villar Senin <svil...@igalia.com>
Unreviewed build fix after r165607. There were two missing replaces.
Modified: trunk/Source/WebCore/platform/graphics/TextRun.h (165610 => 165611)
--- trunk/Source/WebCore/platform/graphics/TextRun.h 2014-03-14 09:21:25 UTC (rev 165610)
+++ trunk/Source/WebCore/platform/graphics/TextRun.h 2014-03-14 10:12:51 UTC (rev 165611)
@@ -189,7 +189,6 @@
class RenderingContext : public RefCounted<RenderingContext> {
public:
- virtual std::unique_ptr<GlyphToPathTranslator> createGlyphToPathTranslator(const SimpleFontData&, const GlyphBuffer&, int from, int numGlyphs, const FloatPoint&) const = 0;
virtual ~RenderingContext() { }
#if ENABLE(SVG_FONTS)
@@ -197,6 +196,7 @@
virtual void drawSVGGlyphs(GraphicsContext*, const SimpleFontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const = 0;
virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, String& glyphName) const = 0;
virtual bool applySVGKerning(const SimpleFontData*, WidthIterator&, GlyphBuffer*, int from) const = 0;
+ virtual std::unique_ptr<GlyphToPathTranslator> createGlyphToPathTranslator(const SimpleFontData&, const GlyphBuffer&, int from, int numGlyphs, const FloatPoint&) const = 0;
#endif
};
Modified: trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h (165610 => 165611)
--- trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h 2014-03-14 09:21:25 UTC (rev 165610)
+++ trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.h 2014-03-14 10:12:51 UTC (rev 165611)
@@ -59,7 +59,9 @@
virtual ~SVGTextRunRenderingContext() { }
+#if ENABLE(SVG_FONTS)
virtual std::unique_ptr<GlyphToPathTranslator> createGlyphToPathTranslator(const SimpleFontData&, const GlyphBuffer&, int from, int numGlyphs, const FloatPoint&) const override;
+#endif
RenderObject& m_renderer;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
