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

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

Issue 68643007: Remove QualifiedName argument from SVGElement::create functions (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGAltGlyphItemElement.h ('k') | Source/core/svg/SVGAnimateColorElement.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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #include "config.h" 20 #include "config.h"
21 21
22 #if ENABLE(SVG_FONTS) 22 #if ENABLE(SVG_FONTS)
23 #include "core/svg/SVGAltGlyphItemElement.h" 23 #include "core/svg/SVGAltGlyphItemElement.h"
24 24
25 #include "SVGNames.h" 25 #include "SVGNames.h"
26 #include "core/svg/SVGGlyphRefElement.h" 26 #include "core/svg/SVGGlyphRefElement.h"
27 27
28 namespace WebCore { 28 namespace WebCore {
29 29
30 inline SVGAltGlyphItemElement::SVGAltGlyphItemElement(const QualifiedName& tagNa me, Document& document) 30 inline SVGAltGlyphItemElement::SVGAltGlyphItemElement(Document& document)
31 : SVGElement(tagName, document) 31 : SVGElement(SVGNames::altGlyphItemTag, document)
32 { 32 {
33 ASSERT(hasTagName(SVGNames::altGlyphItemTag));
34 ScriptWrappable::init(this); 33 ScriptWrappable::init(this);
35 } 34 }
36 35
37 PassRefPtr<SVGAltGlyphItemElement> SVGAltGlyphItemElement::create(const Qualifie dName& tagName, Document& document) 36 PassRefPtr<SVGAltGlyphItemElement> SVGAltGlyphItemElement::create(Document& docu ment)
38 { 37 {
39 return adoptRef(new SVGAltGlyphItemElement(tagName, document)); 38 return adoptRef(new SVGAltGlyphItemElement(document));
40 } 39 }
41 40
42 bool SVGAltGlyphItemElement::hasValidGlyphElements(Vector<String>& glyphNames) c onst 41 bool SVGAltGlyphItemElement::hasValidGlyphElements(Vector<String>& glyphNames) c onst
43 { 42 {
44 // Spec: http://www.w3.org/TR/SVG/text.html#AltGlyphItemElement 43 // Spec: http://www.w3.org/TR/SVG/text.html#AltGlyphItemElement
45 // 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.
46 // 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.
47 // 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
48 // ‘altGlyph’ element. 47 // ‘altGlyph’ element.
49 // 48 //
50 // 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
51 // there is at least one glyph. 50 // there is at least one glyph.
52 for (Node* child = firstChild(); child; child = child->nextSibling()) { 51 for (Node* child = firstChild(); child; child = child->nextSibling()) {
53 if (child->hasTagName(SVGNames::glyphRefTag)) { 52 if (child->hasTagName(SVGNames::glyphRefTag)) {
54 String referredGlyphName; 53 String referredGlyphName;
55 if (toSVGGlyphRefElement(child)->hasValidGlyphElement(referredGlyphN ame)) 54 if (toSVGGlyphRefElement(child)->hasValidGlyphElement(referredGlyphN ame))
56 glyphNames.append(referredGlyphName); 55 glyphNames.append(referredGlyphName);
57 else { 56 else {
58 glyphNames.clear(); 57 glyphNames.clear();
59 return false; 58 return false;
60 } 59 }
61 } 60 }
62 } 61 }
63 return !glyphNames.isEmpty(); 62 return !glyphNames.isEmpty();
64 } 63 }
65 64
66 } 65 }
67 66
68 #endif 67 #endif
OLDNEW
« no previous file with comments | « Source/core/svg/SVGAltGlyphItemElement.h ('k') | Source/core/svg/SVGAnimateColorElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698