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

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

Issue 631153003: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/svg (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/SVGTextContentElement.h ('k') | Source/core/svg/SVGTextElement.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) 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 30 matching lines...) Expand all
41 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ()); 41 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ());
42 if (entries.isEmpty()) { 42 if (entries.isEmpty()) {
43 entries.append(std::make_pair(SVGLengthAdjustSpacing, "spacing")); 43 entries.append(std::make_pair(SVGLengthAdjustSpacing, "spacing"));
44 entries.append(std::make_pair(SVGLengthAdjustSpacingAndGlyphs, "spacingA ndGlyphs")); 44 entries.append(std::make_pair(SVGLengthAdjustSpacingAndGlyphs, "spacingA ndGlyphs"));
45 } 45 }
46 return entries; 46 return entries;
47 } 47 }
48 48
49 // SVGTextContentElement's 'textLength' attribute needs special handling. 49 // SVGTextContentElement's 'textLength' attribute needs special handling.
50 // It should return getComputedTextLength() when textLength is not specified man ually. 50 // It should return getComputedTextLength() when textLength is not specified man ually.
51 class SVGAnimatedTextLength FINAL : public SVGAnimatedLength { 51 class SVGAnimatedTextLength final : public SVGAnimatedLength {
52 public: 52 public:
53 static PassRefPtr<SVGAnimatedTextLength> create(SVGTextContentElement* conte xtElement) 53 static PassRefPtr<SVGAnimatedTextLength> create(SVGTextContentElement* conte xtElement)
54 { 54 {
55 return adoptRef(new SVGAnimatedTextLength(contextElement)); 55 return adoptRef(new SVGAnimatedTextLength(contextElement));
56 } 56 }
57 57
58 virtual SVGLengthTearOff* baseVal() OVERRIDE 58 virtual SVGLengthTearOff* baseVal() override
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)
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 273
274 if (!renderer->isSVGText() && !renderer->isSVGInline()) 274 if (!renderer->isSVGText() && !renderer->isSVGInline())
275 return 0; 275 return 0;
276 276
277 SVGElement* element = toSVGElement(renderer->node()); 277 SVGElement* element = toSVGElement(renderer->node());
278 ASSERT(element); 278 ASSERT(element);
279 return isSVGTextContentElement(*element) ? toSVGTextContentElement(element) : 0; 279 return isSVGTextContentElement(*element) ? toSVGTextContentElement(element) : 0;
280 } 280 }
281 281
282 } 282 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGTextContentElement.h ('k') | Source/core/svg/SVGTextElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698