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

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

Issue 121173004: Make calls to AtomicString(const String&) explicit in svg/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Take feedback into consideration 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/SVGAltGlyphItemElement.h ('k') | Source/core/svg/SVGElement.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) 2011 Leo Yang <leoyang@webkit.org> 2 * Copyright (C) 2011 Leo Yang <leoyang@webkit.org>
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 20 matching lines...) Expand all
31 : SVGElement(SVGNames::altGlyphItemTag, document) 31 : SVGElement(SVGNames::altGlyphItemTag, document)
32 { 32 {
33 ScriptWrappable::init(this); 33 ScriptWrappable::init(this);
34 } 34 }
35 35
36 PassRefPtr<SVGAltGlyphItemElement> SVGAltGlyphItemElement::create(Document& docu ment) 36 PassRefPtr<SVGAltGlyphItemElement> SVGAltGlyphItemElement::create(Document& docu ment)
37 { 37 {
38 return adoptRef(new SVGAltGlyphItemElement(document)); 38 return adoptRef(new SVGAltGlyphItemElement(document));
39 } 39 }
40 40
41 bool SVGAltGlyphItemElement::hasValidGlyphElements(Vector<String>& glyphNames) c onst 41 bool SVGAltGlyphItemElement::hasValidGlyphElements(Vector<AtomicString>& glyphNa mes) const
42 { 42 {
43 // Spec: http://www.w3.org/TR/SVG/text.html#AltGlyphItemElement 43 // Spec: http://www.w3.org/TR/SVG/text.html#AltGlyphItemElement
44 // The ‘altGlyphItem’ element defines a candidate set of possible glyph subs titutions. 44 // The ‘altGlyphItem’ element defines a candidate set of possible glyph subs titutions.
45 // The first ‘altGlyphItem’ element whose referenced glyphs are all availabl e is chosen. 45 // The first ‘altGlyphItem’ element whose referenced glyphs are all availabl e is chosen.
46 // Its glyphs are rendered instead of the character(s) that are inside of th e referencing 46 // Its glyphs are rendered instead of the character(s) that are inside of th e referencing
47 // ‘altGlyph’ element. 47 // ‘altGlyph’ element.
48 // 48 //
49 // Here we fill glyphNames and return true only if all referenced glyphs are valid and 49 // Here we fill glyphNames and return true only if all referenced glyphs are valid and
50 // there is at least one glyph. 50 // there is at least one glyph.
51 for (Node* child = firstChild(); child; child = child->nextSibling()) { 51 for (Node* child = firstChild(); child; child = child->nextSibling()) {
52 if (child->hasTagName(SVGNames::glyphRefTag)) { 52 if (child->hasTagName(SVGNames::glyphRefTag)) {
53 String referredGlyphName; 53 AtomicString referredGlyphName;
54 if (toSVGGlyphRefElement(child)->hasValidGlyphElement(referredGlyphN ame)) 54 if (toSVGGlyphRefElement(child)->hasValidGlyphElement(referredGlyphN ame))
55 glyphNames.append(referredGlyphName); 55 glyphNames.append(referredGlyphName);
56 else { 56 else {
57 glyphNames.clear(); 57 glyphNames.clear();
58 return false; 58 return false;
59 } 59 }
60 } 60 }
61 } 61 }
62 return !glyphNames.isEmpty(); 62 return !glyphNames.isEmpty();
63 } 63 }
64 64
65 } 65 }
66 66
67 #endif 67 #endif
OLDNEW
« no previous file with comments | « Source/core/svg/SVGAltGlyphItemElement.h ('k') | Source/core/svg/SVGElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698