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

Side by Side Diff: Source/WebCore/svg/SVGVKernElement.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
« no previous file with comments | « Source/WebCore/svg/SVGHKernElement.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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 return adoptRef(new SVGVKernElement(tagName, document)); 43 return adoptRef(new SVGVKernElement(tagName, document));
44 } 44 }
45 45
46 void SVGVKernElement::insertedIntoDocument() 46 void SVGVKernElement::insertedIntoDocument()
47 { 47 {
48 ContainerNode* fontNode = parentNode(); 48 ContainerNode* fontNode = parentNode();
49 if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) { 49 if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) {
50 if (SVGFontElement* element = static_cast<SVGFontElement*>(fontNode)) 50 if (SVGFontElement* element = static_cast<SVGFontElement*>(fontNode))
51 element->invalidateGlyphCache(); 51 element->invalidateGlyphCache();
52 } 52 }
53 SVGElement::insertedIntoDocument();
53 } 54 }
54 55
55 void SVGVKernElement::removedFromDocument() 56 void SVGVKernElement::removedFromDocument()
56 { 57 {
57 ContainerNode* fontNode = parentNode(); 58 ContainerNode* fontNode = parentNode();
58 if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) { 59 if (fontNode && fontNode->hasTagName(SVGNames::fontTag)) {
59 if (SVGFontElement* element = static_cast<SVGFontElement*>(fontNode)) 60 if (SVGFontElement* element = static_cast<SVGFontElement*>(fontNode))
60 element->invalidateGlyphCache(); 61 element->invalidateGlyphCache();
61 } 62 }
62 } 63 }
(...skipping 13 matching lines...) Expand all
76 && parseKerningUnicodeString(u1, kerningPair.unicodeRange1, kerningPair. unicodeName1) 77 && parseKerningUnicodeString(u1, kerningPair.unicodeRange1, kerningPair. unicodeName1)
77 && parseKerningUnicodeString(u2, kerningPair.unicodeRange2, kerningPair. unicodeName2)) { 78 && parseKerningUnicodeString(u2, kerningPair.unicodeRange2, kerningPair. unicodeName2)) {
78 kerningPair.kerning = getAttribute(kAttr).string().toFloat(); 79 kerningPair.kerning = getAttribute(kAttr).string().toFloat();
79 kerningPairs.append(kerningPair); 80 kerningPairs.append(kerningPair);
80 } 81 }
81 } 82 }
82 83
83 } 84 }
84 85
85 #endif // ENABLE(SVG_FONTS) 86 #endif // ENABLE(SVG_FONTS)
OLDNEW
« no previous file with comments | « Source/WebCore/svg/SVGHKernElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698