Source/core/rendering/svg/SVGTextRunRenderingContext.h - Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard]

Unified Diff: Source/core/rendering/svg/SVGTextRunRenderingContext.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebased the patch Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Source/core/rendering/svg/SVGTextRunRenderingContext.h

diff --git a/Source/core/rendering/svg/SVGTextRunRenderingContext.h b/Source/core/rendering/svg/SVGTextRunRenderingContext.h

index ac438a6dc2793907d7cdd449ffb87dacdda539fd..c91e8a1cc76a9a94acd9259fd80300e86515afad 100644

--- a/Source/core/rendering/svg/SVGTextRunRenderingContext.h

+++ b/Source/core/rendering/svg/SVGTextRunRenderingContext.h

@@ -29,7 +29,7 @@ namespace blink {

class RenderObject;

class RenderSVGResource;

-class SVGTextRunRenderingContext FINAL : public TextRun::RenderingContext {

+class SVGTextRunRenderingContext final : public TextRun::RenderingContext {

public:

static PassRefPtr<SVGTextRunRenderingContext> create(RenderObject* renderer)

{

@@ -39,13 +39,13 @@ public:

RenderObject* renderer() const { return m_renderer; }

#if ENABLE(SVG_FONTS)

- virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, SimpleShaper&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceLength) OVERRIDE;

- virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const OVERRIDE;

- virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, Glyph& glyphId) const OVERRIDE;

+ virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, SimpleShaper&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceLength) override;

+ virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const override;

+ virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, Glyph& glyphId) const override;

#else

- virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, SimpleShaper&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceLength) OVERRIDE { return 0; }

- virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const OVERRIDE { }

- virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, Glyph& glyphId) const OVERRIDE { return 0; }

+ virtual GlyphData glyphDataForCharacter(const Font&, const TextRun&, SimpleShaper&, UChar32 character, bool mirror, int currentCharacter, unsigned& advanceLength) override { return 0; }

+ virtual void drawSVGGlyphs(GraphicsContext*, const TextRun&, const SimpleFontData*, const GlyphBuffer&, int from, int to, const FloatPoint&) const override { }

+ virtual float floatWidthUsingSVGFont(const Font&, const TextRun&, int& charsConsumed, Glyph& glyphId) const override { return 0; }

#endif

private:

« no previous file with comments | « Source/core/rendering/svg/SVGRootInlineBox.h ('k') | Source/core/streams/ReadableStreamImpl.h » ('j') | no next file with comments »