| 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 if (attrName == SVGNames::inAttr || attrName == SVGNames::in2Attr) { | 164 if (attrName == SVGNames::inAttr || attrName == SVGNames::in2Attr) { |
| 165 invalidate(); | 165 invalidate(); |
| 166 return; | 166 return; |
| 167 } | 167 } |
| 168 | 168 |
| 169 ASSERT_NOT_REACHED(); | 169 ASSERT_NOT_REACHED(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 PassRefPtr<FilterEffect> SVGFECompositeElement::build(SVGFilterBuilder* filterBu
ilder, Filter* filter) | 172 PassRefPtr<FilterEffect> SVGFECompositeElement::build(SVGFilterBuilder* filterBu
ilder, Filter* filter) |
| 173 { | 173 { |
| 174 FilterEffect* input1 = filterBuilder->getEffectById(in1CurrentValue()); | 174 FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(in1CurrentV
alue())); |
| 175 FilterEffect* input2 = filterBuilder->getEffectById(in2CurrentValue()); | 175 FilterEffect* input2 = filterBuilder->getEffectById(AtomicString(in2CurrentV
alue())); |
| 176 | 176 |
| 177 if (!input1 || !input2) | 177 if (!input1 || !input2) |
| 178 return 0; | 178 return 0; |
| 179 | 179 |
| 180 RefPtr<FilterEffect> effect = FEComposite::create(filter, svgOperatorCurrent
Value(), k1CurrentValue(), k2CurrentValue(), k3CurrentValue(), k4CurrentValue())
; | 180 RefPtr<FilterEffect> effect = FEComposite::create(filter, svgOperatorCurrent
Value(), k1CurrentValue(), k2CurrentValue(), k3CurrentValue(), k4CurrentValue())
; |
| 181 FilterEffectVector& inputEffects = effect->inputEffects(); | 181 FilterEffectVector& inputEffects = effect->inputEffects(); |
| 182 inputEffects.reserveCapacity(2); | 182 inputEffects.reserveCapacity(2); |
| 183 inputEffects.append(input1); | 183 inputEffects.append(input1); |
| 184 inputEffects.append(input2); | 184 inputEffects.append(input2); |
| 185 return effect.release(); | 185 return effect.release(); |
| 186 } | 186 } |
| 187 | 187 |
| 188 } | 188 } |
| OLD | NEW |