Changeset 49472 in webkit
- Timestamp:
- Oct 12, 2009 2:15:12 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 4 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r49447 r49472 1 2009-10-12 Dirk Schulze <krit@webkit.org> 2 3 Reviewed by Eirc Seidel. 4 5 feMergeNod has a reference to an effect that doesn't exist. This test will 6 check if SVGFEMergeElement handles this correctly and stops the filter process. 7 8 * svg/filters/feMerge-wrong-input-expected.checksum: Added. 9 * svg/filters/feMerge-wrong-input-expected.png: Added. 10 * svg/filters/feMerge-wrong-input-expected.txt: Added. 11 * svg/filters/feMerge-wrong-input.svg: Added. 12 1 13 2009-10-12 Chris Marrin <cmarrin@apple.com> 2 14 -
trunk/WebCore/ChangeLog
r49447 r49472 1 2009-10-12 Dirk Schulze <krit@webkit.org> 2 3 Reviewed by Eric Seidel. 4 5 SVG - crash on feMerge when input not available 6 [https://bugs.webkit.org/show_bug.cgi?id=30297] 7 8 Make a early return in SVGFEMergeElement if the needed 9 filter effect doesn't exist. 10 11 Test: svg/filters/feMerge-wrong-input.svg 12 13 * svg/SVGFEMergeElement.cpp: 14 (WebCore::SVGFEMergeElement::build): 15 1 16 2009-10-12 Chris Marrin <cmarrin@apple.com> 2 17 -
trunk/WebCore/svg/SVGFEMergeElement.cpp
r45747 r49472 46 46 if (n->hasTagName(SVGNames::feMergeNodeTag)) { 47 47 FilterEffect* mergeEffect = filterResource->builder()->getEffectById(static_cast<SVGFEMergeNodeElement*>(n)->in1()); 48 if (!mergeEffect) 49 return false; 48 50 mergeInputs.append(mergeEffect); 49 51 }
Note: See TracChangeset
for help on using the changeset viewer.