| OLD | NEW |
| 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, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "core/layout/svg/LayoutSVGTextPath.h" | 23 #include "core/layout/svg/LayoutSVGTextPath.h" |
| 24 #include "core/svg/SVGDocumentExtensions.h" | 24 #include "core/svg/SVGDocumentExtensions.h" |
| 25 | 25 |
| 26 namespace blink { | 26 namespace blink { |
| 27 | 27 |
| 28 template <> | 28 template <> |
| 29 const SVGEnumerationStringEntries& | 29 const SVGEnumerationStringEntries& |
| 30 getStaticStringEntries<SVGTextPathMethodType>() { | 30 getStaticStringEntries<SVGTextPathMethodType>() { |
| 31 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ()); | 31 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ()); |
| 32 if (entries.isEmpty()) { | 32 if (entries.isEmpty()) { |
| 33 entries.append(std::make_pair(SVGTextPathMethodAlign, "align")); | 33 entries.push_back(std::make_pair(SVGTextPathMethodAlign, "align")); |
| 34 entries.append(std::make_pair(SVGTextPathMethodStretch, "stretch")); | 34 entries.push_back(std::make_pair(SVGTextPathMethodStretch, "stretch")); |
| 35 } | 35 } |
| 36 return entries; | 36 return entries; |
| 37 } | 37 } |
| 38 | 38 |
| 39 template <> | 39 template <> |
| 40 const SVGEnumerationStringEntries& | 40 const SVGEnumerationStringEntries& |
| 41 getStaticStringEntries<SVGTextPathSpacingType>() { | 41 getStaticStringEntries<SVGTextPathSpacingType>() { |
| 42 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ()); | 42 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ()); |
| 43 if (entries.isEmpty()) { | 43 if (entries.isEmpty()) { |
| 44 entries.append(std::make_pair(SVGTextPathSpacingAuto, "auto")); | 44 entries.push_back(std::make_pair(SVGTextPathSpacingAuto, "auto")); |
| 45 entries.append(std::make_pair(SVGTextPathSpacingExact, "exact")); | 45 entries.push_back(std::make_pair(SVGTextPathSpacingExact, "exact")); |
| 46 } | 46 } |
| 47 return entries; | 47 return entries; |
| 48 } | 48 } |
| 49 | 49 |
| 50 inline SVGTextPathElement::SVGTextPathElement(Document& document) | 50 inline SVGTextPathElement::SVGTextPathElement(Document& document) |
| 51 : SVGTextContentElement(SVGNames::textPathTag, document), | 51 : SVGTextContentElement(SVGNames::textPathTag, document), |
| 52 SVGURIReference(this), | 52 SVGURIReference(this), |
| 53 m_startOffset( | 53 m_startOffset( |
| 54 SVGAnimatedLength::create(this, | 54 SVGAnimatedLength::create(this, |
| 55 SVGNames::startOffsetAttr, | 55 SVGNames::startOffsetAttr, |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 if (rootParent->isConnected()) | 157 if (rootParent->isConnected()) |
| 158 clearResourceReferences(); | 158 clearResourceReferences(); |
| 159 } | 159 } |
| 160 | 160 |
| 161 bool SVGTextPathElement::selfHasRelativeLengths() const { | 161 bool SVGTextPathElement::selfHasRelativeLengths() const { |
| 162 return m_startOffset->currentValue()->isRelative() || | 162 return m_startOffset->currentValue()->isRelative() || |
| 163 SVGTextContentElement::selfHasRelativeLengths(); | 163 SVGTextContentElement::selfHasRelativeLengths(); |
| 164 } | 164 } |
| 165 | 165 |
| 166 } // namespace blink | 166 } // namespace blink |
| OLD | NEW |