Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Side by Side Diff: Source/core/svg/SVGFontElement.h

Issue 631153003: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/svg (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « Source/core/svg/SVGFontData.h ('k') | Source/core/svg/SVGFontFaceElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 2 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 SVGKerningPair() 44 SVGKerningPair()
45 : kerning(0) 45 : kerning(0)
46 { 46 {
47 } 47 }
48 }; 48 };
49 49
50 typedef unsigned KerningPairKey; 50 typedef unsigned KerningPairKey;
51 typedef Vector<SVGKerningPair> KerningPairVector; 51 typedef Vector<SVGKerningPair> KerningPairVector;
52 typedef HashMap<KerningPairKey, float> KerningTable; 52 typedef HashMap<KerningPairKey, float> KerningTable;
53 53
54 class SVGFontElement FINAL : public SVGElement { 54 class SVGFontElement final : public SVGElement {
55 DEFINE_WRAPPERTYPEINFO(); 55 DEFINE_WRAPPERTYPEINFO();
56 public: 56 public:
57 DECLARE_NODE_FACTORY(SVGFontElement); 57 DECLARE_NODE_FACTORY(SVGFontElement);
58 58
59 void invalidateGlyphCache(); 59 void invalidateGlyphCache();
60 void collectGlyphsForString(const String&, Vector<SVGGlyph>&); 60 void collectGlyphsForString(const String&, Vector<SVGGlyph>&);
61 void collectGlyphsForAltGlyphReference(const String&, Vector<SVGGlyph>&); 61 void collectGlyphsForAltGlyphReference(const String&, Vector<SVGGlyph>&);
62 62
63 float horizontalKerningForPairOfGlyphs(Glyph, Glyph) const; 63 float horizontalKerningForPairOfGlyphs(Glyph, Glyph) const;
64 float verticalKerningForPairOfGlyphs(Glyph, Glyph) const; 64 float verticalKerningForPairOfGlyphs(Glyph, Glyph) const;
65 65
66 // Used by SimpleFontData/SimpleShaper. 66 // Used by SimpleFontData/SimpleShaper.
67 SVGGlyph svgGlyphForGlyph(Glyph); 67 SVGGlyph svgGlyphForGlyph(Glyph);
68 Glyph missingGlyph(); 68 Glyph missingGlyph();
69 69
70 private: 70 private:
71 explicit SVGFontElement(Document&); 71 explicit SVGFontElement(Document&);
72 72
73 virtual bool rendererIsNeeded(const RenderStyle&) OVERRIDE { return false; } 73 virtual bool rendererIsNeeded(const RenderStyle&) override { return false; }
74 74
75 void ensureGlyphCache(); 75 void ensureGlyphCache();
76 void registerLigaturesInGlyphCache(Vector<String>&); 76 void registerLigaturesInGlyphCache(Vector<String>&);
77 Vector<SVGGlyph> buildGlyphList(const UnicodeRanges&, const HashSet<String>& unicodeNames, const HashSet<String>& glyphNames) const; 77 Vector<SVGGlyph> buildGlyphList(const UnicodeRanges&, const HashSet<String>& unicodeNames, const HashSet<String>& glyphNames) const;
78 void addPairsToKerningTable(const SVGKerningPair&, KerningTable&); 78 void addPairsToKerningTable(const SVGKerningPair&, KerningTable&);
79 void buildKerningTable(const KerningPairVector&, KerningTable&); 79 void buildKerningTable(const KerningPairVector&, KerningTable&);
80 80
81 81
82 KerningTable m_horizontalKerningTable; 82 KerningTable m_horizontalKerningTable;
83 KerningTable m_verticalKerningTable; 83 KerningTable m_verticalKerningTable;
84 SVGGlyphMap m_glyphMap; 84 SVGGlyphMap m_glyphMap;
85 Glyph m_missingGlyph; 85 Glyph m_missingGlyph;
86 bool m_isGlyphCacheValid; 86 bool m_isGlyphCacheValid;
87 }; 87 };
88 88
89 } // namespace blink 89 } // namespace blink
90 90
91 #endif // ENABLE(SVG_FONTS) 91 #endif // ENABLE(SVG_FONTS)
92 #endif // SVGFontElement_h 92 #endif // SVGFontElement_h
OLDNEW
« no previous file with comments | « Source/core/svg/SVGFontData.h ('k') | Source/core/svg/SVGFontFaceElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698