| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006 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 10 matching lines...) Expand all Loading... |
| 21 #include "core/svg/SVGFETurbulenceElement.h" | 21 #include "core/svg/SVGFETurbulenceElement.h" |
| 22 | 22 |
| 23 #include "core/SVGNames.h" | 23 #include "core/SVGNames.h" |
| 24 | 24 |
| 25 namespace blink { | 25 namespace blink { |
| 26 | 26 |
| 27 template <> | 27 template <> |
| 28 const SVGEnumerationStringEntries& getStaticStringEntries<SVGStitchOptions>() { | 28 const SVGEnumerationStringEntries& getStaticStringEntries<SVGStitchOptions>() { |
| 29 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ()); | 29 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ()); |
| 30 if (entries.isEmpty()) { | 30 if (entries.isEmpty()) { |
| 31 entries.append(std::make_pair(kSvgStitchtypeStitch, "stitch")); | 31 entries.push_back(std::make_pair(kSvgStitchtypeStitch, "stitch")); |
| 32 entries.append(std::make_pair(kSvgStitchtypeNostitch, "noStitch")); | 32 entries.push_back(std::make_pair(kSvgStitchtypeNostitch, "noStitch")); |
| 33 } | 33 } |
| 34 return entries; | 34 return entries; |
| 35 } | 35 } |
| 36 | 36 |
| 37 template <> | 37 template <> |
| 38 const SVGEnumerationStringEntries& getStaticStringEntries<TurbulenceType>() { | 38 const SVGEnumerationStringEntries& getStaticStringEntries<TurbulenceType>() { |
| 39 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ()); | 39 DEFINE_STATIC_LOCAL(SVGEnumerationStringEntries, entries, ()); |
| 40 if (entries.isEmpty()) { | 40 if (entries.isEmpty()) { |
| 41 entries.append( | 41 entries.push_back( |
| 42 std::make_pair(FETURBULENCE_TYPE_FRACTALNOISE, "fractalNoise")); | 42 std::make_pair(FETURBULENCE_TYPE_FRACTALNOISE, "fractalNoise")); |
| 43 entries.append(std::make_pair(FETURBULENCE_TYPE_TURBULENCE, "turbulence")); | 43 entries.push_back( |
| 44 std::make_pair(FETURBULENCE_TYPE_TURBULENCE, "turbulence")); |
| 44 } | 45 } |
| 45 return entries; | 46 return entries; |
| 46 } | 47 } |
| 47 | 48 |
| 48 inline SVGFETurbulenceElement::SVGFETurbulenceElement(Document& document) | 49 inline SVGFETurbulenceElement::SVGFETurbulenceElement(Document& document) |
| 49 : SVGFilterPrimitiveStandardAttributes(SVGNames::feTurbulenceTag, document), | 50 : SVGFilterPrimitiveStandardAttributes(SVGNames::feTurbulenceTag, document), |
| 50 m_baseFrequency( | 51 m_baseFrequency( |
| 51 SVGAnimatedNumberOptionalNumber::create(this, | 52 SVGAnimatedNumberOptionalNumber::create(this, |
| 52 SVGNames::baseFrequencyAttr)), | 53 SVGNames::baseFrequencyAttr)), |
| 53 m_seed(SVGAnimatedNumber::create(this, | 54 m_seed(SVGAnimatedNumber::create(this, |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 FilterEffect* SVGFETurbulenceElement::build(SVGFilterBuilder*, Filter* filter) { | 124 FilterEffect* SVGFETurbulenceElement::build(SVGFilterBuilder*, Filter* filter) { |
| 124 return FETurbulence::create( | 125 return FETurbulence::create( |
| 125 filter, m_type->currentValue()->enumValue(), | 126 filter, m_type->currentValue()->enumValue(), |
| 126 baseFrequencyX()->currentValue()->value(), | 127 baseFrequencyX()->currentValue()->value(), |
| 127 baseFrequencyY()->currentValue()->value(), | 128 baseFrequencyY()->currentValue()->value(), |
| 128 m_numOctaves->currentValue()->value(), m_seed->currentValue()->value(), | 129 m_numOctaves->currentValue()->value(), m_seed->currentValue()->value(), |
| 129 m_stitchTiles->currentValue()->enumValue() == kSvgStitchtypeStitch); | 130 m_stitchTiles->currentValue()->enumValue() == kSvgStitchtypeStitch); |
| 130 } | 131 } |
| 131 | 132 |
| 132 } // namespace blink | 133 } // namespace blink |
| OLD | NEW |