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

Side by Side Diff: Source/core/svg/SVGVKernElement.cpp

Issue 18278003: Introduce isSVGFontElement() and isSVGImageElement(), and use them (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 5 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/SVGLocatable.cpp ('k') | no next file » | 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) Research In Motion Limited 2010. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 26 matching lines...) Expand all
37 37
38 PassRefPtr<SVGVKernElement> SVGVKernElement::create(const QualifiedName& tagName , Document* document) 38 PassRefPtr<SVGVKernElement> SVGVKernElement::create(const QualifiedName& tagName , Document* document)
39 { 39 {
40 return adoptRef(new SVGVKernElement(tagName, document)); 40 return adoptRef(new SVGVKernElement(tagName, document));
41 } 41 }
42 42
43 Node::InsertionNotificationRequest SVGVKernElement::insertedInto(ContainerNode* rootParent) 43 Node::InsertionNotificationRequest SVGVKernElement::insertedInto(ContainerNode* rootParent)
44 { 44 {
45 if (rootParent->inDocument()) { 45 if (rootParent->inDocument()) {
46 ContainerNode* fontNode = parentNode(); 46 ContainerNode* fontNode = parentNode();
47 if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) 47 if (fontNode && isSVGFontElement(fontNode))
48 toSVGFontElement(fontNode)->invalidateGlyphCache(); 48 toSVGFontElement(fontNode)->invalidateGlyphCache();
49 } 49 }
50 50
51 return SVGElement::insertedInto(rootParent); 51 return SVGElement::insertedInto(rootParent);
52 } 52 }
53 53
54 void SVGVKernElement::removedFrom(ContainerNode* rootParent) 54 void SVGVKernElement::removedFrom(ContainerNode* rootParent)
55 { 55 {
56 ContainerNode* fontNode = parentNode(); 56 ContainerNode* fontNode = parentNode();
57 if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) 57 if (fontNode && isSVGFontElement(fontNode))
58 toSVGFontElement(fontNode)->invalidateGlyphCache(); 58 toSVGFontElement(fontNode)->invalidateGlyphCache();
59 59
60 SVGElement::removedFrom(rootParent); 60 SVGElement::removedFrom(rootParent);
61 } 61 }
62 62
63 void SVGVKernElement::buildVerticalKerningPair(KerningPairVector& kerningPairs) 63 void SVGVKernElement::buildVerticalKerningPair(KerningPairVector& kerningPairs)
64 { 64 {
65 String u1 = fastGetAttribute(SVGNames::u1Attr); 65 String u1 = fastGetAttribute(SVGNames::u1Attr);
66 String g1 = fastGetAttribute(SVGNames::g1Attr); 66 String g1 = fastGetAttribute(SVGNames::g1Attr);
67 String u2 = fastGetAttribute(SVGNames::u2Attr); 67 String u2 = fastGetAttribute(SVGNames::u2Attr);
68 String g2 = fastGetAttribute(SVGNames::g2Attr); 68 String g2 = fastGetAttribute(SVGNames::g2Attr);
69 if ((u1.isEmpty() && g1.isEmpty()) || (u2.isEmpty() && g2.isEmpty())) 69 if ((u1.isEmpty() && g1.isEmpty()) || (u2.isEmpty() && g2.isEmpty()))
70 return; 70 return;
71 71
72 SVGKerningPair kerningPair; 72 SVGKerningPair kerningPair;
73 if (parseGlyphName(g1, kerningPair.glyphName1) 73 if (parseGlyphName(g1, kerningPair.glyphName1)
74 && parseGlyphName(g2, kerningPair.glyphName2) 74 && parseGlyphName(g2, kerningPair.glyphName2)
75 && parseKerningUnicodeString(u1, kerningPair.unicodeRange1, kerningPair. unicodeName1) 75 && parseKerningUnicodeString(u1, kerningPair.unicodeRange1, kerningPair. unicodeName1)
76 && parseKerningUnicodeString(u2, kerningPair.unicodeRange2, kerningPair. unicodeName2)) { 76 && parseKerningUnicodeString(u2, kerningPair.unicodeRange2, kerningPair. unicodeName2)) {
77 kerningPair.kerning = fastGetAttribute(SVGNames::kAttr).string().toFloat (); 77 kerningPair.kerning = fastGetAttribute(SVGNames::kAttr).string().toFloat ();
78 kerningPairs.append(kerningPair); 78 kerningPairs.append(kerningPair);
79 } 79 }
80 } 80 }
81 81
82 } 82 }
83 83
84 #endif // ENABLE(SVG_FONTS) 84 #endif // ENABLE(SVG_FONTS)
OLDNEW
« no previous file with comments | « Source/core/svg/SVGLocatable.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698