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

Side by Side Diff: Source/WebCore/svg/SVGHKernElement.cpp

Issue 6714006: Merge 80520 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 9 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
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, 2008 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 return adoptRef(new SVGHKernElement(tagName, document)); 45 return adoptRef(new SVGHKernElement(tagName, document));
46 } 46 }
47 47
48 void SVGHKernElement::insertedIntoDocument() 48 void SVGHKernElement::insertedIntoDocument()
49 { 49 {
50 ContainerNode* fontNode = parentNode(); 50 ContainerNode* fontNode = parentNode();
51 if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) { 51 if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) {
52 if (SVGFontElement* element = static_cast<SVGFontElement*>(fontNode)) 52 if (SVGFontElement* element = static_cast<SVGFontElement*>(fontNode))
53 element->invalidateGlyphCache(); 53 element->invalidateGlyphCache();
54 } 54 }
55 SVGElement::insertedIntoDocument();
55 } 56 }
56 57
57 void SVGHKernElement::removedFromDocument() 58 void SVGHKernElement::removedFromDocument()
58 { 59 {
59 ContainerNode* fontNode = parentNode(); 60 ContainerNode* fontNode = parentNode();
60 if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) { 61 if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) {
61 if (SVGFontElement* element = static_cast<SVGFontElement*>(fontNode)) 62 if (SVGFontElement* element = static_cast<SVGFontElement*>(fontNode))
62 element->invalidateGlyphCache(); 63 element->invalidateGlyphCache();
63 } 64 }
64 } 65 }
(...skipping 13 matching lines...) Expand all
78 && parseKerningUnicodeString(u1, kerningPair.unicodeRange1, kerningPair. unicodeName1) 79 && parseKerningUnicodeString(u1, kerningPair.unicodeRange1, kerningPair. unicodeName1)
79 && parseKerningUnicodeString(u2, kerningPair.unicodeRange2, kerningPair. unicodeName2)) { 80 && parseKerningUnicodeString(u2, kerningPair.unicodeRange2, kerningPair. unicodeName2)) {
80 kerningPair.kerning = getAttribute(kAttr).string().toFloat(); 81 kerningPair.kerning = getAttribute(kAttr).string().toFloat();
81 kerningPairs.append(kerningPair); 82 kerningPairs.append(kerningPair);
82 } 83 }
83 } 84 }
84 85
85 } 86 }
86 87
87 #endif // ENABLE(SVG_FONTS) 88 #endif // ENABLE(SVG_FONTS)
OLDNEW
« no previous file with comments | « LayoutTests/svg/dom/vkern-element-crash-expected.txt ('k') | Source/WebCore/svg/SVGVKernElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698