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

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

Issue 145333003: Convert remaining RenderSVG* nodes to RenderObject::isChildAllowed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove some instances of childShouldCreateRenderer. Created 6 years, 10 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
« no previous file with comments | « no previous file | Source/core/rendering/svg/RenderSVGModelObject.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) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz> 2 * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
3 * Copyright (C) 2006 Apple Inc. All rights reserved. 3 * Copyright (C) 2006 Apple Inc. All rights reserved.
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
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 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 */ 20 */
21 21
22 #include "config.h" 22 #include "config.h"
23 23
24 #include "core/rendering/svg/RenderSVGInline.h" 24 #include "core/rendering/svg/RenderSVGInline.h"
25 25
26 #include "SVGNames.h"
26 #include "core/rendering/svg/RenderSVGText.h" 27 #include "core/rendering/svg/RenderSVGText.h"
27 #include "core/rendering/svg/SVGInlineFlowBox.h" 28 #include "core/rendering/svg/SVGInlineFlowBox.h"
28 #include "core/rendering/svg/SVGRenderSupport.h" 29 #include "core/rendering/svg/SVGRenderSupport.h"
29 #include "core/rendering/svg/SVGResourcesCache.h" 30 #include "core/rendering/svg/SVGResourcesCache.h"
30 31
31 namespace WebCore { 32 namespace WebCore {
32 33
33 bool RenderSVGInline::isChildAllowed(RenderObject* child, RenderStyle* style) co nst 34 bool RenderSVGInline::isChildAllowed(RenderObject* child, RenderStyle* style) co nst
34 { 35 {
35 if (child->isText()) 36 if (child->isText())
36 return SVGRenderSupport::isRenderableTextNode(child); 37 return SVGRenderSupport::isRenderableTextNode(child);
37 38
39 if (node()->hasTagName(SVGNames::aTag)) {
40 // Disallow direct descendant 'a'.
41 if (child->node()->hasTagName(SVGNames::aTag))
42 return false;
43 }
44
38 if (!child->isSVGInline() && !child->isSVGInlineText()) 45 if (!child->isSVGInline() && !child->isSVGInlineText())
39 return false; 46 return false;
40 47
41 return RenderInline::isChildAllowed(child, style); 48 return RenderInline::isChildAllowed(child, style);
42 } 49 }
43 50
44 RenderSVGInline::RenderSVGInline(Element* element) 51 RenderSVGInline::RenderSVGInline(Element* element)
45 : RenderInline(element) 52 : RenderInline(element)
46 { 53 {
47 setAlwaysCreateLineBoxes(); 54 setAlwaysCreateLineBoxes();
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 RenderInline::removeChild(child); 149 RenderInline::removeChild(child);
143 return; 150 return;
144 } 151 }
145 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes; 152 Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
146 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes); 153 textRenderer->subtreeChildWillBeRemoved(child, affectedAttributes);
147 RenderInline::removeChild(child); 154 RenderInline::removeChild(child);
148 textRenderer->subtreeChildWasRemoved(affectedAttributes); 155 textRenderer->subtreeChildWasRemoved(affectedAttributes);
149 } 156 }
150 157
151 } 158 }
OLDNEW
« no previous file with comments | « no previous file | Source/core/rendering/svg/RenderSVGModelObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698