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

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

Issue 268223003: Move InvalidationGuard/InstanceUpdateBlocker out of SVGElementInstance (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Perform the renames Created 6 years, 7 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/SVGSymbolElement.cpp ('k') | Source/core/svg/SVGTextPathElement.cpp » ('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) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
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,
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 void SVGTextContentElement::svgAttributeChanged(const QualifiedName& attrName) 248 void SVGTextContentElement::svgAttributeChanged(const QualifiedName& attrName)
249 { 249 {
250 if (!isSupportedAttribute(attrName)) { 250 if (!isSupportedAttribute(attrName)) {
251 SVGGraphicsElement::svgAttributeChanged(attrName); 251 SVGGraphicsElement::svgAttributeChanged(attrName);
252 return; 252 return;
253 } 253 }
254 254
255 if (attrName == SVGNames::textLengthAttr) 255 if (attrName == SVGNames::textLengthAttr)
256 m_textLengthIsSpecifiedByUser = true; 256 m_textLengthIsSpecifiedByUser = true;
257 257
258 SVGElementInstance::InvalidationGuard invalidationGuard(this); 258 SVGElement::InvalidationGuard invalidationGuard(this);
259 259
260 if (RenderObject* renderer = this->renderer()) 260 if (RenderObject* renderer = this->renderer())
261 RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer); 261 RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
262 } 262 }
263 263
264 bool SVGTextContentElement::selfHasRelativeLengths() const 264 bool SVGTextContentElement::selfHasRelativeLengths() const
265 { 265 {
266 // Any element of the <text> subtree is advertized as using relative lengths . 266 // Any element of the <text> subtree is advertized as using relative lengths .
267 // On any window size change, we have to relayout the text subtree, as the 267 // On any window size change, we have to relayout the text subtree, as the
268 // effective 'on-screen' font size may change. 268 // effective 'on-screen' font size may change.
269 return true; 269 return true;
270 } 270 }
271 271
272 SVGTextContentElement* SVGTextContentElement::elementFromRenderer(RenderObject* renderer) 272 SVGTextContentElement* SVGTextContentElement::elementFromRenderer(RenderObject* renderer)
273 { 273 {
274 if (!renderer) 274 if (!renderer)
275 return 0; 275 return 0;
276 276
277 if (!renderer->isSVGText() && !renderer->isSVGInline()) 277 if (!renderer->isSVGText() && !renderer->isSVGInline())
278 return 0; 278 return 0;
279 279
280 SVGElement* element = toSVGElement(renderer->node()); 280 SVGElement* element = toSVGElement(renderer->node());
281 ASSERT(element); 281 ASSERT(element);
282 return isSVGTextContentElement(*element) ? toSVGTextContentElement(element) : 0; 282 return isSVGTextContentElement(*element) ? toSVGTextContentElement(element) : 0;
283 } 283 }
284 284
285 } 285 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGSymbolElement.cpp ('k') | Source/core/svg/SVGTextPathElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698