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

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

Issue 904043002: Revert of Fix inconsistent LengthMode definition for 'textLength' (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | « LayoutTests/svg/animations/animate-textlength-unitmode-expected.txt ('k') | no next file » | 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 { 59 {
60 SVGTextContentElement* textContentElement = toSVGTextContentElement(cont extElement()); 60 SVGTextContentElement* textContentElement = toSVGTextContentElement(cont extElement());
61 if (!textContentElement->textLengthIsSpecifiedByUser()) 61 if (!textContentElement->textLengthIsSpecifiedByUser())
62 baseValue()->newValueSpecifiedUnits(LengthTypeNumber, textContentEle ment->getComputedTextLength()); 62 baseValue()->newValueSpecifiedUnits(LengthTypeNumber, textContentEle ment->getComputedTextLength());
63 63
64 return SVGAnimatedLength::baseVal(); 64 return SVGAnimatedLength::baseVal();
65 } 65 }
66 66
67 private: 67 private:
68 SVGAnimatedTextLength(SVGTextContentElement* contextElement) 68 SVGAnimatedTextLength(SVGTextContentElement* contextElement)
69 : SVGAnimatedLength(contextElement, SVGNames::textLengthAttr, SVGLength: :create(LengthModeWidth), ForbidNegativeLengths) 69 : SVGAnimatedLength(contextElement, SVGNames::textLengthAttr, SVGLength: :create(LengthModeOther), ForbidNegativeLengths)
70 { 70 {
71 } 71 }
72 }; 72 };
73 73
74 74
75 SVGTextContentElement::SVGTextContentElement(const QualifiedName& tagName, Docum ent& document) 75 SVGTextContentElement::SVGTextContentElement(const QualifiedName& tagName, Docum ent& document)
76 : SVGGraphicsElement(tagName, document) 76 : SVGGraphicsElement(tagName, document)
77 , m_textLength(SVGAnimatedTextLength::create(this)) 77 , m_textLength(SVGAnimatedTextLength::create(this))
78 , m_textLengthIsSpecifiedByUser(false) 78 , m_textLengthIsSpecifiedByUser(false)
79 , m_lengthAdjust(SVGAnimatedEnumeration<SVGLengthAdjustType>::create(this, S VGNames::lengthAdjustAttr, SVGLengthAdjustSpacing)) 79 , m_lengthAdjust(SVGAnimatedEnumeration<SVGLengthAdjustType>::create(this, S VGNames::lengthAdjustAttr, SVGLengthAdjustSpacing))
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 271
272 if (!renderer->isSVGText() && !renderer->isSVGInline()) 272 if (!renderer->isSVGText() && !renderer->isSVGInline())
273 return 0; 273 return 0;
274 274
275 SVGElement* element = toSVGElement(renderer->node()); 275 SVGElement* element = toSVGElement(renderer->node());
276 ASSERT(element); 276 ASSERT(element);
277 return isSVGTextContentElement(*element) ? toSVGTextContentElement(element) : 0; 277 return isSVGTextContentElement(*element) ? toSVGTextContentElement(element) : 0;
278 } 278 }
279 279
280 } 280 }
OLDNEW
« no previous file with comments | « LayoutTests/svg/animations/animate-textlength-unitmode-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698