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

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

Issue 62083002: Remove support for the externalResourcesRequired attribute. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebaseline test Created 6 years, 11 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/SVGFilterElement.idl ('k') | Source/core/svg/SVGFontElement.cpp » ('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 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 */ 20 */
21 21
22 #ifndef SVGFontElement_h 22 #ifndef SVGFontElement_h
23 #define SVGFontElement_h 23 #define SVGFontElement_h
24 24
25 #if ENABLE(SVG_FONTS) 25 #if ENABLE(SVG_FONTS)
26 #include "SVGNames.h" 26 #include "SVGNames.h"
27 #include "core/svg/SVGAnimatedBoolean.h" 27 #include "core/svg/SVGAnimatedBoolean.h"
28 #include "core/svg/SVGElement.h" 28 #include "core/svg/SVGElement.h"
29 #include "core/svg/SVGExternalResourcesRequired.h"
30 #include "core/svg/SVGGlyphMap.h" 29 #include "core/svg/SVGGlyphMap.h"
31 #include "core/svg/SVGParserUtilities.h" 30 #include "core/svg/SVGParserUtilities.h"
32 31
33 namespace WebCore { 32 namespace WebCore {
34 33
35 // Describe an SVG <hkern>/<vkern> element 34 // Describe an SVG <hkern>/<vkern> element
36 struct SVGKerningPair { 35 struct SVGKerningPair {
37 float kerning; 36 float kerning;
38 UnicodeRanges unicodeRange1; 37 UnicodeRanges unicodeRange1;
39 UnicodeRanges unicodeRange2; 38 UnicodeRanges unicodeRange2;
40 HashSet<String> unicodeName1; 39 HashSet<String> unicodeName1;
41 HashSet<String> unicodeName2; 40 HashSet<String> unicodeName2;
42 HashSet<String> glyphName1; 41 HashSet<String> glyphName1;
43 HashSet<String> glyphName2; 42 HashSet<String> glyphName2;
44 43
45 SVGKerningPair() 44 SVGKerningPair()
46 : kerning(0) 45 : kerning(0)
47 { 46 {
48 } 47 }
49 }; 48 };
50 49
51 typedef Vector<SVGKerningPair> KerningPairVector; 50 typedef Vector<SVGKerningPair> KerningPairVector;
52 51
53 class SVGMissingGlyphElement; 52 class SVGMissingGlyphElement;
54 53
55 class SVGFontElement FINAL : public SVGElement 54 class SVGFontElement FINAL : public SVGElement {
56 , public SVGExternalResourcesRequired {
57 public: 55 public:
58 static PassRefPtr<SVGFontElement> create(Document&); 56 static PassRefPtr<SVGFontElement> create(Document&);
59 57
60 void invalidateGlyphCache(); 58 void invalidateGlyphCache();
61 void collectGlyphsForString(const String&, Vector<SVGGlyph>&); 59 void collectGlyphsForString(const String&, Vector<SVGGlyph>&);
62 void collectGlyphsForGlyphName(const String&, Vector<SVGGlyph>&); 60 void collectGlyphsForGlyphName(const String&, Vector<SVGGlyph>&);
63 61
64 float horizontalKerningForPairOfStringsAndGlyphs(const String& u1, const Str ing& g1, const String& u2, const String& g2) const; 62 float horizontalKerningForPairOfStringsAndGlyphs(const String& u1, const Str ing& g1, const String& u2, const String& g2) const;
65 float verticalKerningForPairOfStringsAndGlyphs(const String& u1, const Strin g& g1, const String& u2, const String& g2) const; 63 float verticalKerningForPairOfStringsAndGlyphs(const String& u1, const Strin g& g1, const String& u2, const String& g2) const;
66 64
67 // Used by SimpleFontData/WidthIterator. 65 // Used by SimpleFontData/WidthIterator.
68 SVGGlyph svgGlyphForGlyph(Glyph); 66 SVGGlyph svgGlyphForGlyph(Glyph);
69 Glyph missingGlyph(); 67 Glyph missingGlyph();
70 68
71 SVGMissingGlyphElement* firstMissingGlyphElement() const; 69 SVGMissingGlyphElement* firstMissingGlyphElement() const;
72 70
73 private: 71 private:
74 explicit SVGFontElement(Document&); 72 explicit SVGFontElement(Document&);
75 73
76 virtual bool rendererIsNeeded(const RenderStyle&) { return false; } 74 virtual bool rendererIsNeeded(const RenderStyle&) { return false; }
77 75
78 void ensureGlyphCache(); 76 void ensureGlyphCache();
79 void registerLigaturesInGlyphCache(Vector<String>&); 77 void registerLigaturesInGlyphCache(Vector<String>&);
80 78
81 BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGFontElement) 79 BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGFontElement)
82 DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesReq uired)
83 END_DECLARE_ANIMATED_PROPERTIES 80 END_DECLARE_ANIMATED_PROPERTIES
84 81
85 KerningPairVector m_horizontalKerningPairs; 82 KerningPairVector m_horizontalKerningPairs;
86 KerningPairVector m_verticalKerningPairs; 83 KerningPairVector m_verticalKerningPairs;
87 SVGGlyphMap m_glyphMap; 84 SVGGlyphMap m_glyphMap;
88 Glyph m_missingGlyph; 85 Glyph m_missingGlyph;
89 bool m_isGlyphCacheValid; 86 bool m_isGlyphCacheValid;
90 }; 87 };
91 88
92 DEFINE_NODE_TYPE_CASTS(SVGFontElement, hasTagName(SVGNames::fontTag)); 89 DEFINE_NODE_TYPE_CASTS(SVGFontElement, hasTagName(SVGNames::fontTag));
93 90
94 } // namespace WebCore 91 } // namespace WebCore
95 92
96 #endif // ENABLE(SVG_FONTS) 93 #endif // ENABLE(SVG_FONTS)
97 #endif 94 #endif
OLDNEW
« no previous file with comments | « Source/core/svg/SVGFilterElement.idl ('k') | Source/core/svg/SVGFontElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698