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

Side by Side Diff: Source/core/rendering/svg/RenderSVGTSpan.cpp

Issue 191003007: Use isSVG*Element() helpers more in SVG code (Part 3) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * This file is part of the WebKit project. 2 * This file is part of the WebKit project.
3 * 3 *
4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> 4 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
5 * Copyright (C) 2006 Apple Computer Inc. 5 * Copyright (C) 2006 Apple Computer Inc.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
11 * 11 *
12 * This library is distributed in the hope that it will be useful, 12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Library General Public License for more details. 15 * Library General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU Library General Public License 17 * You should have received a copy of the GNU Library General Public License
18 * along with this library; see the file COPYING.LIB. If not, write to 18 * along with this library; see the file COPYING.LIB. If not, write to
19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 * Boston, MA 02110-1301, USA. 20 * Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 24
25 #include "core/rendering/svg/RenderSVGTSpan.h" 25 #include "core/rendering/svg/RenderSVGTSpan.h"
26 26
27 #include "SVGNames.h" 27 #include "SVGNames.h"
28 #include "core/rendering/svg/SVGRenderSupport.h" 28 #include "core/rendering/svg/SVGRenderSupport.h"
29 #include "core/svg/SVGAltGlyphElement.h"
29 30
30 namespace WebCore { 31 namespace WebCore {
31 32
32 RenderSVGTSpan::RenderSVGTSpan(Element* element) 33 RenderSVGTSpan::RenderSVGTSpan(Element* element)
33 : RenderSVGInline(element) 34 : RenderSVGInline(element)
34 { 35 {
35 } 36 }
36 37
37 bool RenderSVGTSpan::isChildAllowed(RenderObject* child, RenderStyle*) const 38 bool RenderSVGTSpan::isChildAllowed(RenderObject* child, RenderStyle*) const
38 { 39 {
39 // Always allow text (except empty textnodes and <br>). 40 // Always allow text (except empty textnodes and <br>).
40 if (child->isText()) 41 if (child->isText())
41 return SVGRenderSupport::isRenderableTextNode(child); 42 return SVGRenderSupport::isRenderableTextNode(child);
42 43
43 #if ENABLE(SVG_FONTS) 44 #if ENABLE(SVG_FONTS)
44 // Only allow other types of children if this is not an 'altGlyph'. 45 // Only allow other types of children if this is not an 'altGlyph'.
45 if (node()->hasTagName(SVGNames::altGlyphTag)) 46 ASSERT(node());
47 if (isSVGAltGlyphElement(*node()))
46 return false; 48 return false;
47 #endif 49 #endif
48 50
49 return child->isSVGInline() && !child->isSVGTextPath(); 51 return child->isSVGInline() && !child->isSVGTextPath();
50 } 52 }
51 53
52 } 54 }
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/RenderSVGResourceMasker.cpp ('k') | Source/core/rendering/svg/RenderSVGTextPath.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698