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

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

Issue 23956012: Stop passing NodeRenderingContext except in textRendererIsNeeded (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 | « Source/core/svg/SVGTextPathElement.h ('k') | Source/core/svg/SVGTitleElement.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) 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2010 Rob Buis <rwlbuis@gmail.com> 3 * Copyright (C) 2010 Rob Buis <rwlbuis@gmail.com>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 */ 19 */
20 20
21 #include "config.h" 21 #include "config.h"
22 22
23 #include "core/svg/SVGTextPathElement.h" 23 #include "core/svg/SVGTextPathElement.h"
24 24
25 #include "SVGNames.h" 25 #include "SVGNames.h"
26 #include "XLinkNames.h" 26 #include "XLinkNames.h"
27 #include "core/dom/NodeRenderingContext.h"
28 #include "core/rendering/svg/RenderSVGResource.h" 27 #include "core/rendering/svg/RenderSVGResource.h"
29 #include "core/rendering/svg/RenderSVGTextPath.h" 28 #include "core/rendering/svg/RenderSVGTextPath.h"
30 #include "core/svg/SVGElementInstance.h" 29 #include "core/svg/SVGElementInstance.h"
31 30
32 namespace WebCore { 31 namespace WebCore {
33 32
34 // Animated property definitions 33 // Animated property definitions
35 DEFINE_ANIMATED_LENGTH(SVGTextPathElement, SVGNames::startOffsetAttr, StartOffse t, startOffset) 34 DEFINE_ANIMATED_LENGTH(SVGTextPathElement, SVGNames::startOffsetAttr, StartOffse t, startOffset)
36 DEFINE_ANIMATED_ENUMERATION(SVGTextPathElement, SVGNames::methodAttr, Method, me thod, SVGTextPathMethodType) 35 DEFINE_ANIMATED_ENUMERATION(SVGTextPathElement, SVGNames::methodAttr, Method, me thod, SVGTextPathMethodType)
37 DEFINE_ANIMATED_ENUMERATION(SVGTextPathElement, SVGNames::spacingAttr, Spacing, spacing, SVGTextPathSpacingType) 36 DEFINE_ANIMATED_ENUMERATION(SVGTextPathElement, SVGNames::spacingAttr, Spacing, spacing, SVGTextPathSpacingType)
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 124
126 if (RenderObject* object = renderer()) 125 if (RenderObject* object = renderer())
127 RenderSVGResource::markForLayoutAndParentResourceInvalidation(object); 126 RenderSVGResource::markForLayoutAndParentResourceInvalidation(object);
128 } 127 }
129 128
130 RenderObject* SVGTextPathElement::createRenderer(RenderStyle*) 129 RenderObject* SVGTextPathElement::createRenderer(RenderStyle*)
131 { 130 {
132 return new RenderSVGTextPath(this); 131 return new RenderSVGTextPath(this);
133 } 132 }
134 133
135 bool SVGTextPathElement::childShouldCreateRenderer(const NodeRenderingContext& c hildContext) const 134 bool SVGTextPathElement::childShouldCreateRenderer(const Node& child) const
136 { 135 {
137 if (childContext.node()->isTextNode() 136 if (child.isTextNode()
138 || childContext.node()->hasTagName(SVGNames::aTag) 137 || child.hasTagName(SVGNames::aTag)
139 || childContext.node()->hasTagName(SVGNames::trefTag) 138 || child.hasTagName(SVGNames::trefTag)
140 || childContext.node()->hasTagName(SVGNames::tspanTag)) 139 || child.hasTagName(SVGNames::tspanTag))
141 return true; 140 return true;
142 141
143 return false; 142 return false;
144 } 143 }
145 144
146 bool SVGTextPathElement::rendererIsNeeded(const NodeRenderingContext& context) 145 bool SVGTextPathElement::rendererIsNeeded(const RenderStyle& style)
147 { 146 {
148 if (parentNode() 147 if (parentNode()
149 && (parentNode()->hasTagName(SVGNames::aTag) 148 && (parentNode()->hasTagName(SVGNames::aTag)
150 || parentNode()->hasTagName(SVGNames::textTag))) 149 || parentNode()->hasTagName(SVGNames::textTag)))
151 return Element::rendererIsNeeded(context); 150 return Element::rendererIsNeeded(style);
152 151
153 return false; 152 return false;
154 } 153 }
155 154
156 void SVGTextPathElement::buildPendingResource() 155 void SVGTextPathElement::buildPendingResource()
157 { 156 {
158 clearResourceReferences(); 157 clearResourceReferences();
159 if (!inDocument()) 158 if (!inDocument())
160 return; 159 return;
161 160
(...skipping 29 matching lines...) Expand all
191 clearResourceReferences(); 190 clearResourceReferences();
192 } 191 }
193 192
194 bool SVGTextPathElement::selfHasRelativeLengths() const 193 bool SVGTextPathElement::selfHasRelativeLengths() const
195 { 194 {
196 return startOffsetCurrentValue().isRelative() 195 return startOffsetCurrentValue().isRelative()
197 || SVGTextContentElement::selfHasRelativeLengths(); 196 || SVGTextContentElement::selfHasRelativeLengths();
198 } 197 }
199 198
200 } 199 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGTextPathElement.h ('k') | Source/core/svg/SVGTitleElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698